svn merge -r41779:41847 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 15 Nov 2011 02:58:06 +0000 (02:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 15 Nov 2011 02:58:06 +0000 (02:58 +0000)
commite6e265b2b59e02cc7816a2ed43471eca8bca0a62
treee312d2c2f6cb1aaf79148648e5725902ab23d34e
parente59ab6486f9e7285815671044b785c28365d5165
parent3442c16c09b31a23f45b23be72e6eb5ba02c7bbf
svn merge -r41779:41847  ^/trunk/blender
40 files changed:
CMakeLists.txt
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/intern/math_geom.c
source/blender/blenlib/intern/math_vector_inline.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/space_info/info_stats.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/SConscript
source/blender/modifiers/intern/MOD_ocean.c
source/blender/modifiers/intern/MOD_util.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/render_texture.c
source/blenderplayer/bad_level_call_stubs/stubs.c