diff options
| author | Peter Kim <pk15950@gmail.com> | 2021-10-03 06:22:05 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2021-10-03 06:22:05 +0300 |
| commit | 6fc81d6bca6424a1e44305df7cdc3598e03b00ba (patch) | |
| tree | a66f17c5378f2a68f4c5d8b09f56687c3d9bf888 /source/blender/makesrna/intern/rna_brush.c | |
| parent | 85e1f28fcaafd137a546bf192777b00f96851e80 (diff) | |
| parent | d3afe0c1265c9ebb53053de68f176b30f0132281 (diff) | |
Merge branch 'master' into xr-controller-supportxr-controller-support
Diffstat (limited to 'source/blender/makesrna/intern/rna_brush.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 25caa411979..1d3b8cd9f9c 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -734,6 +734,12 @@ static void rna_Brush_icon_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Poi WM_main_add_notifier(NC_BRUSH | NA_EDITED, br); } +static bool rna_Brush_imagetype_poll(PointerRNA *UNUSED(ptr), PointerRNA value) +{ + Image *image = (Image *)value.owner_id; + return image->type != IMA_TYPE_R_RESULT && image->type != IMA_TYPE_COMPOSITE; +} + static void rna_TextureSlot_brush_angle_update(bContext *C, PointerRNA *ptr) { Scene *scene = CTX_data_scene(C); @@ -3434,6 +3440,7 @@ static void rna_def_brush(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Clone Image", "Image for clone tool"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, "rna_Brush_update"); + RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_Brush_imagetype_poll"); prop = RNA_def_property(srna, "clone_alpha", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "clone.alpha"); |