Commit: 08297586edfc16ed723611a882c3fb1942661539
Author: Jeroen Bakker
Date: Wed Mar 23 16:03:46 2022 +0100
Branches: temp-T96709-painting-target
https://developer.blender.org/rB08297586edfc16ed723611a882c3fb1942661539
Small changes to UI.
===================================================================
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 0a817148a8e..a778cc24425 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2251,10 +2251,8 @@ class VIEW3D_PT_tools_paint_canvas(View3DPanel, Panel):
)
case 'IMAGE':
- me = ob.data
-
layout.template_ID(settings, "image", new="image.new",
open="image.open")
- layout.menu("VIEW3D_MT_tools_projectpaint_uvlayer")
+ layout.menu("VIEW3D_MT_tools_projectpaint_uvlayer", text="UV
Map")
classes = (
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c
b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 7775f45ded7..e5936c380c0 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -549,6 +549,12 @@ static void rna_ImaPaint_canvas_update(bContext *C,
PointerRNA *UNUSED(ptr))
}
}
+static bool rna_PaintModeSettings_image_poll(PointerRNA *UNUSED(ptr),
PointerRNA value)
+{
+ Image *image = (Image *)value.owner_id;
+ return !ELEM(image->type, IMA_TYPE_COMPOSITE, IMA_TYPE_R_RESULT);
+}
+
static bool rna_ImaPaint_detect_data(ImagePaintSettings *imapaint)
{
return imapaint->missing_data == 0;
@@ -989,8 +995,10 @@ static void rna_def_paint_mode(BlenderRNA *brna)
prop = RNA_def_property(srna, "canvas_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "canvas_type");
RNA_def_property_enum_items(prop, rna_enum_canvas_type_items);
+ RNA_def_property_ui_text(prop, "Canvas", "Type of canvas to paint on");
prop = RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
+ RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL,
"rna_PaintModeSettings_image_poll");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_CONTEXT_UPDATE);
RNA_def_property_ui_text(prop, "Texture", "Image used as as painting
target");
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
