[Bf-blender-cvs] [81958a13938] master: GPencil: Fix user count for autocreated materials

[Antonioya]

Commit: 81958a13938ebcf76316b12a3fa81165ae3cf230
Author: Antonioya
Date:   Sun Mar 10 11:18:52 2019 +0100
Branches: master
https://developer.blender.org/rB81958a13938ebcf76316b12a3fa81165ae3cf230

GPencil: Fix user count for autocreated materials

The user count was 2 when the value must be 1.

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

M       source/blender/editors/gpencil/gpencil_add_monkey.c
M       source/blender/editors/gpencil/gpencil_add_stroke.c

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

diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c 
b/source/blender/editors/gpencil/gpencil_add_monkey.c
index 302a6fb10f6..a4fbd4002fa 100644
--- a/source/blender/editors/gpencil/gpencil_add_monkey.c
+++ b/source/blender/editors/gpencil/gpencil_add_monkey.c
@@ -31,6 +31,7 @@
 #include "BKE_brush.h"
 #include "BKE_context.h"
 #include "BKE_gpencil.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 
@@ -63,6 +64,7 @@ static int gpencil_monkey_color(
        BKE_object_material_slot_add(bmain, ob);
        ma = BKE_material_add_gpencil(bmain, pct->name);
        assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_USERPREF);
+       id_us_min(&ma->id);
 
        copy_v4_v4(ma->gp_style->stroke_rgba, pct->line);
        copy_v4_v4(ma->gp_style->fill_rgba, pct->fill);
diff --git a/source/blender/editors/gpencil/gpencil_add_stroke.c 
b/source/blender/editors/gpencil/gpencil_add_stroke.c
index e02fc4bf801..d8db3cda98d 100644
--- a/source/blender/editors/gpencil/gpencil_add_stroke.c
+++ b/source/blender/editors/gpencil/gpencil_add_stroke.c
@@ -31,6 +31,7 @@
 #include "BKE_brush.h"
 #include "BKE_context.h"
 #include "BKE_gpencil.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 
@@ -62,6 +63,7 @@ static int gp_stroke_material(Main *bmain, Object *ob, const 
ColorTemplate *pct)
        BKE_object_material_slot_add(bmain, ob);
        ma = BKE_material_add_gpencil(bmain, pct->name);
        assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_USERPREF);
+       id_us_min(&ma->id);
 
        copy_v4_v4(ma->gp_style->stroke_rgba, pct->line);
        copy_v4_v4(ma->gp_style->fill_rgba, pct->fill);

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