svn merge ^/trunk/blender -r43611:43616
authorCampbell Barton <ideasman42@gmail.com>
Sun, 22 Jan 2012 20:15:05 +0000 (20:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 22 Jan 2012 20:15:05 +0000 (20:15 +0000)
1  2 
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/editors/uvedit/uvedit_smart_stitch.c