Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-04-12 14:42:52 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-04-16 10:38:01 +0300
commit777446ed7d05c35ef2ab98f83b7968daaf74344b (patch)
tree04063ea026f45fa5a17bc6331f19ea71e5468b8a
parent8a9b5e644ef0dd138a590533ad85c925a274ed6f (diff)
Fix T63492: CTRL+click on an image in a UV or Image Editor crashes
Blender Crash was introduced in rB48e48653c297, rB90f4ff95ed3a `image_sample_invoke` is used for both `IMAGE_OT_sample` and `IMAGE_OT_curves_point_set`. IMAGE_OT_curves_point_set didnt have property `size` defined... Now defines `size` for `IMAGE_OT_curves_point_set` as well Reviewers: brecht Maniphest Tasks: T63492 Differential Revision: https://developer.blender.org/D4675
-rw-r--r--source/blender/editors/space_image/image_ops.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 831be935fa4..85c7d2d8fa9 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -3437,6 +3437,11 @@ void IMAGE_OT_curves_point_set(wmOperatorType *ot)
/* properties */
RNA_def_enum(ot->srna, "point", point_items, 0, "Point", "Set black point or white point for curves");
+
+ PropertyRNA *prop;
+ prop = RNA_def_int(ot->srna, "size", 1, 1, 128, "Sample Size", "", 1, 64);
+ RNA_def_property_subtype(prop, PROP_PIXEL);
+ RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
#if 0 /* Not ported to 2.5x yet */