GP: Set Brush default material when add new GP Object
Before the brush color was not set equal to object active color.
This commit is contained in:
parent
18d354a5eb
commit
33785baafe
|
@ -35,6 +35,7 @@
|
|||
#include "DNA_object_types.h"
|
||||
#include "DNA_scene_types.h"
|
||||
|
||||
#include "BKE_brush.h"
|
||||
#include "BKE_context.h"
|
||||
#include "BKE_gpencil.h"
|
||||
#include "BKE_main.h"
|
||||
|
@ -1440,6 +1441,10 @@ void ED_gpencil_create_monkey(bContext *C, float mat[4][4])
|
|||
|
||||
/* set first color as active */
|
||||
ob->actcol = color_Black + 1;
|
||||
Material *ma = give_current_material(ob, ob->actcol);
|
||||
if (ma != NULL) {
|
||||
BKE_brush_update_material(bmain, ma, NULL);
|
||||
}
|
||||
|
||||
/* layers */
|
||||
/* NOTE: For now, we just add new layers, to make it easier to separate out old/new instances */
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
#include "DNA_object_types.h"
|
||||
#include "DNA_scene_types.h"
|
||||
|
||||
#include "BKE_brush.h"
|
||||
#include "BKE_context.h"
|
||||
#include "BKE_gpencil.h"
|
||||
#include "BKE_main.h"
|
||||
|
@ -229,8 +230,12 @@ void ED_gpencil_create_stroke(bContext *C, float mat[4][4])
|
|||
gp_stroke_material(bmain, ob, &gp_stroke_material_blue);
|
||||
gp_stroke_material(bmain, ob, &gp_stroke_material_grey);
|
||||
|
||||
/* set first color as active */
|
||||
/* set first color as active and in brushes */
|
||||
ob->actcol = color_black + 1;
|
||||
Material *ma = give_current_material(ob, ob->actcol);
|
||||
if (ma != NULL) {
|
||||
BKE_brush_update_material(bmain, ma, NULL);
|
||||
}
|
||||
|
||||
/* layers */
|
||||
bGPDlayer *colors = BKE_gpencil_layer_addnew(gpd, "Colors", false);
|
||||
|
|
Loading…
Reference in New Issue