blender
/
blender
136
419
Fork 601
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Fix #108591: Handle null material adding paint slot #108592

Merged
YimingWu merged 5 commits from ChengduLittleA/blender:fix-108591 into blender-v3.6-release 2023-06-06 04:13:08 +02:00
Conversation 6 Commits 5 Files Changed 1 +6 -3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3531b6c936 - Show all commits

9
source/blender/editors/sculpt_paint/paint_image_proj.cc
View File

@ -6870,9 +6870,12 @@ static int texture_paint_add_texture_paint_slot_invoke(bContext *C,
get_default_texture_layer_name_for_object(ob, type, (char *)&imagename, sizeof(imagename));
RNA_string_set(op->ptr, "name", imagename);
/* Set default color. Copy the color from nodes, so it matches the existing material. */
float color[4];
default_paint_slot_color_get(type, ma, color);
/* Set default color. Copy the color from nodes, so it matches the existing material.
* Material could be null so we should have a default color. */
float color[4]={1.0f, 1.0f, 1.0f, 1.0f};
if(ma) {
default_paint_slot_color_get(type, ma, color);
}
RNA_float_set_array(op->ptr, "color", color);
return WM_operator_props_dialog_popup(C, op, 300);