svn merge ^/trunk/blender -r42009:42053
authorCampbell Barton <ideasman42@gmail.com>
Tue, 22 Nov 2011 11:51:42 +0000 (11:51 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 22 Nov 2011 11:51:42 +0000 (11:51 +0000)
commitf9e00b5c99ba8dfc5bf19a59ab73d8be8f125bf3
treecea447f44b698dcf9a69fc45db887dce638aa89e
parent33e74e9f938bc4e8a733b82c33b9a1113dfb5904
parentfd742566a62151c1f2ed1f009782fc8a881fbf5a
svn merge ^/trunk/blender -r42009:42053
18 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/loopcut.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_shading.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_ocean.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c