svn merge ^/trunk/blender -r40405:40431
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 11:30:55 +0000 (11:30 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 11:30:55 +0000 (11:30 +0000)
commit5bd83eede042302dc734810a3a314eb3320b2ed5
tree09ceb7ea8c294cfca1c41184044476ab178172b9
parent161c3861bc09d3e666d4c73d35da85e024fe779f
parentae0124157f012aeda994534c21aebda1bae054cd
svn merge ^/trunk/blender -r40405:40431
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesdna/DNA_modifier_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c