blender
/
blender
137
426
Fork 612
Code Issues 6.2k Pull Requests 780 Projects 19 Wiki Activity

GPv3: Assign correct GP material #113526

Merged
Pratik Borhade merged 1 commits from PratikPB2123/blender:gpv3-material into main 2023-10-11 13:06:20 +02:00
Conversation 0 Commits 1 Files Changed 1 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a6517ed6b6 - Show all commits

2
source/blender/editors/render/render_shading.cc
View File

@ -773,7 +773,7 @@ static int new_material_exec(bContext *C, wmOperator * /*op*/)
}
else {
const char *name = DATA_("Material");
if (!(ob != nullptr && ob->type == OB_GPENCIL_LEGACY)) {
if (!(ob != nullptr && ELEM(ob->type, OB_GPENCIL_LEGACY, OB_GREASE_PENCIL))) {
ma = BKE_material_add(bmain, name);
}
else {