blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Fix: compiler warnings due to recent commit 

This is a fix for warnings caused by the patch b96cdbcf7a.

Differential Revision: https://developer.blender.org/D14891
This commit is contained in:
Ethan-Hall 2022-05-09 13:06:42 +02:00 committed by Hans Goudey
parent b508999d8d
commit 719c86c0a6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -6600,12 +6600,15 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op)
}
case PAINT_CANVAS_SOURCE_COLOR_ATTRIBUTE: {
new_node = nodeAddStaticNode(C, ntree, SH_NODE_ATTRIBUTE);
if (layer = proj_paint_color_attribute_create(op, ob)) {
if ((layer = proj_paint_color_attribute_create(op, ob))) {
BLI_strncpy_utf8(
&((NodeShaderAttribute *)new_node->storage)->name, &layer->name, MAX_NAME);
((NodeShaderAttribute *)new_node->storage)->name, layer->name, MAX_NAME);
}
break;
}
case PAINT_CANVAS_SOURCE_MATERIAL:
BLI_assert_unreachable();
return false;
}
nodeSetActive(ntree, new_node);
@ -6783,6 +6786,9 @@ static void texture_paint_add_texture_paint_slot_ui(bContext *C, wmOperator *op)
uiItemR(layout, op->ptr, "domain", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "data_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
break;
case PAINT_CANVAS_SOURCE_MATERIAL:
BLI_assert_unreachable();
break;
}
uiItemR(layout, op->ptr, "color", 0, NULL, ICON_NONE);