svn merge ^/trunk/blender -r55357:55372
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Mar 2013 21:45:29 +0000 (21:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Mar 2013 21:45:29 +0000 (21:45 +0000)
commit29b7b344fc48ed31b1e36818ab4767090691d6e2
tree2c7496c8c656565d2ac6dc0901e1af66f8565101
parentc1ceab1281ccf061f03f8000bf190a082a5385d8
parent7bfef29f2f2a1b262d28abdc6e30fcd9c1f1caad
svn merge ^/trunk/blender -r55357:55372
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/pipeline.c
source/blenderplayer/bad_level_call_stubs/stubs.c