[Bf-blender-cvs] [690063e] master: Fix T48897: Flatten brush fails on first stroke

[Campbell Barton]

Commit: 690063edb928b2755462863d971600deb608f848
Author: Campbell Barton
Date:   Wed Jul 20 13:54:55 2016 +1000
Branches: master
https://developer.blender.org/rB690063edb928b2755462863d971600deb608f848

Fix T48897: Flatten brush fails on first stroke

The flatten brush depended on accumulate being disabled,
Adding dynotopo support for accumulate caused problems for this tool (see 
T44390).
Enable for existing files.

===================================================================

M       source/blender/blenloader/intern/versioning_270.c
M       source/blender/blenloader/intern/versioning_defaults.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_270.c 
b/source/blender/blenloader/intern/versioning_270.c
index ac2811a..8d96d7c 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1225,5 +1225,11 @@ void blo_do_versions_270(FileData *fd, Library 
*UNUSED(lib), Main *main)
                                }
                        }
                }
+
+               for (Brush *br = main->brush.first; br; br = br->id.next) {
+                       if (br->sculpt_tool == SCULPT_TOOL_FLATTEN) {
+                               br->flag |= BRUSH_ACCUMULATE;
+                       }
+               }
        }
 }
diff --git a/source/blender/blenloader/intern/versioning_defaults.c 
b/source/blender/blenloader/intern/versioning_defaults.c
index ad7a3c5..0ed7a39 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -256,6 +256,11 @@ void BLO_update_defaults_startup_blend(Main *bmain)
                if (br) {
                        br->alpha = 1.0f;
                }
+
+               br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, 
"Flatten/Contrast");
+               if (br) {
+                       br->flag |= BRUSH_ACCUMULATE;
+               }
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs