svn merge ^/trunk/blender -r42722:42742
authorCampbell Barton <ideasman42@gmail.com>
Tue, 20 Dec 2011 01:33:14 +0000 (01:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 20 Dec 2011 01:33:14 +0000 (01:33 +0000)
commitefb4eff35312afb372e2a46aa598d12a74ff4a52
treeb039276297f2deea8bff39e606c9bf89b0dbc590
parent2457d4f5abd65095ae48be937ed43d026d47124a
parent71ce197bbb09af00980f6efc4891dc2a7ffda36b
svn merge ^/trunk/blender -r42722:42742
CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/render/intern/source/render_texture.c
source/creator/CMakeLists.txt