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)
commita63efc00cc5fca26510fdb435eb9d699dd293a6d
treebe67b3bfb88200105a1ce5b03d2c416e2c53f06e
parent6eb0ca9385aaf69c89172a5826592e5ad9dac198
parent359e961a12e5c2f6432b8d65a543d2d6e389ba17
svn merge ^/trunk/blender -r43611:43616
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/editors/uvedit/uvedit_smart_stitch.c