svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sat, 10 Sep 2011 23:49:39 +0000 (23:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 10 Sep 2011 23:49:39 +0000 (23:49 +0000)
commit75b393612809252349bf4062bc45df14c1a5dfe5
tree12650c13c6e927a9e084491aca3d09b77f4f4974
parentceb9b237f224a480ef13ca151af07aa2d1e1ea60
parentfbf3a76f1d4b50b81334f55efbff7a1e6ba1f413
svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
26 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_object.h
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/SConscript
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/util/CMakeLists.txt
source/blender/editors/util/SConscript
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/SConscript
source/blender/modifiers/intern/MOD_util.c
source/creator/CMakeLists.txt
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp