svn merge ^/trunk/blender -r42361:42372
authorCampbell Barton <ideasman42@gmail.com>
Sat, 3 Dec 2011 21:01:26 +0000 (21:01 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 3 Dec 2011 21:01:26 +0000 (21:01 +0000)
commit70ee57280416e6356559c46276a42c34b04bdfc9
tree15e3c3a820e2456254fd70f0ef72f513cc47c05e
parent243131edc05dc2ac09fb5386483bf103a403ad90
parent03b807e7dcbd186ce75a726c6935e96e855b8290
svn merge ^/trunk/blender -r42361:42372
CMakeLists.txt
source/blender/editors/space_view3d/drawobject.c