Commit: a58a68fa540e6e55424be0d26bf2d34599777a3b
Author: Antonio Vazquez
Date: Wed Nov 27 10:54:43 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa58a68fa540e6e55424be0d26bf2d34599777a3b
Revert "GPencil: Decrease user count when the material is unpinned"
This reverts commit d76d1b7d214fce9362d5c499d403ac9a6f244cb0.
My change was totally wrong. The user count was already handled.
===================================================================
M source/blender/editors/gpencil/gpencil_data.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_data.c
b/source/blender/editors/gpencil/gpencil_data.c
index e9b6c236a00..cfc224a445e 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1668,9 +1668,6 @@ static void gp_bruh_delete_mode_brushes(Main *bmain,
const enum eContextObjectMo
/* Before delete, unpinn any material of the brush. */
if ((brush->gpencil_settings) && (brush->gpencil_settings->material !=
NULL)) {
- Material *ma = brush->gpencil_settings->material;
- id_us_min(&ma->id);
-
brush->gpencil_settings->material = NULL;
brush->gpencil_settings->flag &= ~GP_BRUSH_MATERIAL_PINNED;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
