archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix new material for pinned objects

Browse Source 
Grease pencil check was using active object.
This commit is contained in:
Campbell Barton
2019-01-03 12:33:12 +11:00
parent ba9e10fd6a
commit 487df02198
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/render/render_shading.c
View File

@@ -526,30 +526,32 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op))
PointerRNA ptr, idptr;
PropertyRNA *prop;
/* hook into UI */
UI_context_active_but_prop_get_templateID(C, &ptr, &prop);
Object *ob = (prop && RNA_struct_is_a(ptr.type, &RNA_Object)) ? ptr.data : NULL;
/* add or copy material */
if (ma) {
ma = BKE_material_copy(bmain, ma);
}
else {
Object *ob = CTX_data_active_object(C);
if ((!ob) || (ob->type != OB_GPENCIL)) {
ma = BKE_material_add(bmain, DATA_("Material"));
const char *name = DATA_("Material");
if (!(ob != NULL && ob->type == OB_GPENCIL)) {
ma = BKE_material_add(bmain, name);
}
else {
ma = BKE_material_add_gpencil(bmain, DATA_("Material"));
ma = BKE_material_add_gpencil(bmain, name);
}
ED_node_shader_default(C, &ma->id);
ma->use_nodes = true;
}
/* hook into UI */
UI_context_active_but_prop_get_templateID(C, &ptr, &prop);
if (prop) {
if (RNA_struct_is_a(ptr.type, &RNA_Object)) {
if (ob != NULL) {
/* Add slot follows user-preferences for creating new slots,
* RNA pointer assignment doesn't, see: T60014. */
Object *ob = ptr.data;
if (give_current_material_p(ob, ob->actcol) == NULL) {
BKE_object_material_slot_add(bmain, ob);
}