svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 10 Nov 2011 03:05:11 +0000 (03:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 10 Nov 2011 03:05:11 +0000 (03:05 +0000)
commit685041d53a5a86c6c30fff6995a3873c4fb7d0af
tree5d671082efe0eee7645f34da3c3c793747eaafa8
parentee1828be191e31c00820a25488acfca61f66e5bd
parent28ee0f92184af8ba6f44d08eda23ce5eb3815697
svn merge -r41650:41655 ^/trunk/blender  --- cycles merge, this wont copile, still need to manually update some funcs
16 files changed:
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedbmesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/include/ED_uvedit.h
source/blender/editors/mesh/mesh_data.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_node/SConscript
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_ui_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c