From b7bcc30329251f33f4b0b58689d5489f9c42299d Mon Sep 17 00:00:00 2001 From: Antonioya Date: Sun, 10 Mar 2019 08:55:38 +0100 Subject: GPencil: Set brush material after copying a material This change updates the brush material in the topbar when a new material is created using copy button. Related to task T62384 Thanks to @matc for suggesting the fix. Still pending a problem whith user number. --- source/blender/editors/render/render_shading.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/blender/editors/render') diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index d1bed15872d..51edf6c835f 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -43,6 +43,7 @@ #include "BLT_translation.h" #include "BKE_animsys.h" +#include "BKE_brush.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_editmesh.h" @@ -530,6 +531,11 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op)) Material *new_ma = NULL; BKE_id_copy_ex(bmain, &ma->id, (ID **)&new_ma, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS); ma = new_ma; + + if (ob != NULL && ob->type == OB_GPENCIL) { + BKE_brush_update_material(bmain, new_ma, NULL); + } + } else { const char *name = DATA_("Material"); -- cgit v1.2.3