Commit: f0c21cbc833aa6c444ad0d72ad92521e899564ee
Author: Bastien Montagne
Date: Fri Jul 22 16:55:27 2016 +0200
Branches: soc-2016-pbvh-painting
https://developer.blender.org/rBf0c21cbc833aa6c444ad0d72ad92521e899564ee
Merge branch 'master' into soc-2016-pbvh-painting
Conflicts:
source/blender/blenloader/intern/versioning_defaults.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_defaults.c
index fd26aab,0ed7a39..01a40d8
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@@ -269,12 -257,10 +269,17 @@@ void BLO_update_defaults_startup_blend(
br->alpha = 1.0f;
}
- br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Average");
- if (!br) {
- br = BKE_brush_add(bmain, "Average", OB_MODE_VERTEX_PAINT |
OB_MODE_WEIGHT_PAINT);
- br->vertexpaint_tool = PAINT_BLEND_AVERAGE;
- br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
- }
+ br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR,
"Flatten/Contrast");
+ if (br) {
+ br->flag |= BRUSH_ACCUMULATE;
+ }
++
++ br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR,
"Average");
++ if (!br) {
++ br = BKE_brush_add(bmain, "Average",
OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
++ br->vertexpaint_tool = PAINT_BLEND_AVERAGE;
++ br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
++ }
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
