svn merge ^/trunk/blender -r43524:43530
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jan 2012 16:30:56 +0000 (16:30 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jan 2012 16:30:56 +0000 (16:30 +0000)
commit330da356dab13db7d094064a00d56347b1d53e79
treed80a91bb1d2122b07cedb9d11836cf7ab80affa8
parent7b2101ace983cc9d7112dd45a8b264b51657dea9
parent167999304ea0053532e84aff0c7fd0d1ce002a6c
svn merge ^/trunk/blender -r43524:43530
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesrna/intern/rna_object_api.c