svn merge ^/trunk/blender -r42290:42292
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 Nov 2011 10:07:04 +0000 (10:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 Nov 2011 10:07:04 +0000 (10:07 +0000)
commitdf5af02dec6f35081e7b3baa24f42b5bc3c57111
treeb2daa24cd37850b1277b2fc77a1a14a29934692f
parent9e5b28cd42a3cf87ac76e3b27b52dce08071d244
parentd24bbba150e5359a8b4c876fb387b3f7d69897d0
svn merge ^/trunk/blender -r42290:42292
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/dynamicpaint.c