Tamito Kajiyama 9ca7f6659f Merged changes in the trunk up to revision 44419. ... Conflicts resolved: doc/python_api/sphinx_doc_gen.py source/blender/blenloader/intern/readfile.c source/blender/editors/space_view3d/drawobject.c source/creator/CMakeLists.txt		2012-02-25 01:26:45 +00:00
build_files	Merged changes in the trunk up to revision 44419.	2012-02-25 01:26:45 +00:00
doc	Merged changes in the trunk up to revision 44419.	2012-02-25 01:26:45 +00:00
extern	bmesh docs now written in sphinx doc generator.	2012-02-24 09:53:29 +00:00
intern	Cycles: tweak for AMD opencl compile of advanced shading, from Daniel Genrich,	2012-02-24 15:53:19 +00:00
release	Merged changes in the trunk up to revision 44419.	2012-02-25 01:26:45 +00:00
source	Merged changes in the trunk up to revision 44419.	2012-02-25 01:26:45 +00:00
CMakeLists.txt	Fix #30270, #30265: cycles not displaying textured objects, and not rendering	2012-02-21 14:39:59 +00:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling	2012-02-08 04:37:37 +00:00
SConstruct	Reverting changes made to build systems when was upgrading OpenAL.	2012-02-17 16:58:34 +00:00