svn merge -r38500:38600 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jul 2011 04:17:15 +0000 (04:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jul 2011 04:17:15 +0000 (04:17 +0000)
commit6d5080783e48a6767415ef0538e0a272fefee759
tree316c26cc9138dd34831a3e2f56580d1f3d3b4dce
parentfc95382a977163a1d499c732960e7501cc065833
parent0e933d089df3a17327caf8700c19df9f419a2973
svn merge -r38500:38600 https://svn.blender.org/svnroot/bf-blender/trunk/blender
16 files changed:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/mesh_conv.c
source/blender/editors/object/object_bake.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/convertblender.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp