[Bf-blender-cvs] [56ff53854bb] soc-2016-pbvh-painting: Severin suggested I move new brushes to versioning_270.c
Nathan Vollmer
noreply at git.blender.org
Wed Apr 12 12:44:25 CEST 2017
Commit: 56ff53854bbd0211cccaa25cdf9f404bdbfefde8
Author: Nathan Vollmer
Date: Wed Apr 12 04:44:06 2017 -0600
Branches: soc-2016-pbvh-painting
https://developer.blender.org/rB56ff53854bbd0211cccaa25cdf9f404bdbfefde8
Severin suggested I move new brushes to versioning_270.c
===================================================================
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 d3f33cf725f..d551d088c67 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -60,6 +60,7 @@
#include "DNA_genfile.h"
#include "BKE_animsys.h"
+#include "BKE_brush.h"
#include "BKE_colortools.h"
#include "BKE_library.h"
#include "BKE_main.h"
@@ -1609,6 +1610,23 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
}
}
}
+
+ {
+ Brush *br;
+ br = (Brush *)BKE_libblock_find_name_ex(main, ID_BR, "Average");
+ if (!br) {
+ br = BKE_brush_add(main, "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(main, ID_BR, "Smudge");
+ if (!br) {
+ br = BKE_brush_add(main, "Smudge", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
+ br->vertexpaint_tool = PAINT_BLEND_SMUDGE;
+ br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
+ }
+ }
}
}
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 990ed419d10..845f8ff0523 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -289,20 +289,6 @@ void BLO_update_defaults_startup_blend(Main *bmain)
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;
- }
-
- br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Smudge");
- if (!br) {
- br = BKE_brush_add(bmain, "Smudge", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
- br->vertexpaint_tool = PAINT_BLEND_SMUDGE;
- br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
- }
}
}
More information about the Bf-blender-cvs
mailing list