svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 03:16:12 +0000 (03:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 03:16:12 +0000 (03:16 +0000)
commite74e2450304bde73b015d87c256b310ba6c641a6
treecc4462c67752f3f62ae2a3607bcb58269a59e602
parent7495757553fe16d64dca7fa868845939edbbb06d
parentfa32395b33f084d5c6c9d8026fd7d53335c9b41a
svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
24 files changed:
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenlib/BLI_math_vector.h
source/blender/blenloader/SConscript
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_main_api.c
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/SConscript
source/blender/modifiers/intern/MOD_screw.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt