diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2013-12-19 02:48:26 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2013-12-19 02:50:39 +0400 |
commit | 94a2801322e4bd07d40c12196fc65150297a54dc (patch) | |
tree | 12dd7ddde73f10fd6f672c33b0e43b2b0b746f98 /source/blender/makesrna/intern/rna_brush.c | |
parent | d7033d56371e1cb4dc9b8e6fc8732affe3d50d60 (diff) |
Fix T37807 gravity causes crashes when using shif-smoothing.
Turns out we didn't properly free node proxies that gravity did use and
strokes ended up accessing previous data. Also deactivated gravity when
a smooth brush is used. It is kind of distracting to get the mesh
gravitated while smoothing.
Diffstat (limited to 'source/blender/makesrna/intern/rna_brush.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 6114686e9b2..80455d71954 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -251,7 +251,7 @@ static int rna_BrushCapabilities_has_texture_angle_get(PointerRNA *ptr) static int rna_SculptToolCapabilities_has_gravity_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; - return br->sculpt_tool != SCULPT_TOOL_MASK; + return !ELEM(br->sculpt_tool, SCULPT_TOOL_MASK, SCULPT_TOOL_SMOOTH); } static int rna_BrushCapabilities_has_texture_angle_source_get(PointerRNA *ptr) |