Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-05-06 18:26:52 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-05-06 18:27:45 +0400
commit09f5dff244ede0a4797b2949217032aac2b8f564 (patch)
tree69382642d3e2531a08e12d8b3f1cc117e1672227 /source/blender/editors/sculpt_paint/sculpt.c
parentd9a72be86e63c52a145a9b93753acf302d4c30e8 (diff)
Fixes to previous sculpting tweaks
undo didn't work, layer and smooth crashed..
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt.c')
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index b75387d5551..4a1a65832e6 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -4250,7 +4250,7 @@ static void sculpt_stroke_modifiers_check(const bContext *C, Object *ob)
{
SculptSession *ss = ob->sculpt;
- if (ss->modifiers_active) {
+ if (ss->kb || ss->modifiers_active) {
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
Brush *brush = BKE_paint_brush(&sd->paint);
@@ -4573,13 +4573,16 @@ static void sculpt_stroke_update_step(bContext *C, struct PaintStroke *UNUSED(st
*
* Could be optimized later, but currently don't think it's so
* much common scenario.
- **
- ** Same applies to the DAG_id_tag_update() invoked from
+ *
+ * Same applies to the DAG_id_tag_update() invoked from
* sculpt_flush_update().
*/
- if (ss->kb || ss->modifiers_active) {
+ if (ss->modifiers_active) {
sculpt_flush_stroke_deform(sd, ob);
}
+ else if (ss->kb) {
+ sculpt_update_keyblock(ob);
+ }
ss->cache->first_time = false;