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)
1  2 
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

Simple merge
Simple merge