diff options
author | Thomas Dinges <blender@dingto.org> | 2013-03-01 02:50:24 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-03-01 02:50:24 +0400 |
commit | 681b2ec49cef2e00aac954c40d7388d94505734e (patch) | |
tree | 6e3d71e8dab42cc1a8fad4a8046e3926be38a756 /source/blender/editors/space_image | |
parent | d7e427beffb6589ada91c4336e6ee86459cb24d8 (diff) |
Fix / Workaround for [#34474] "Record Composite" image op segfaults in compositor code
* These operators have never been ported to 2.5x and therefore should not come up inside the UI. (as they are not working).
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r-- | source/blender/editors/space_image/image_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_image/space_image.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h index f86e59c41a8..5184b1e1a73 100644 --- a/source/blender/editors/space_image/image_intern.h +++ b/source/blender/editors/space_image/image_intern.h @@ -87,8 +87,6 @@ void IMAGE_OT_sample(struct wmOperatorType *ot); void IMAGE_OT_sample_line(struct wmOperatorType *ot); void IMAGE_OT_curves_point_set(struct wmOperatorType *ot); -void IMAGE_OT_record_composite(struct wmOperatorType *ot); - /* image_panels.c */ struct ImageUser *ntree_get_active_iuser(struct bNodeTree *ntree); void image_buttons_register(struct ARegionType *art); diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 61dd457f2af..b913b3528ac 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -2439,6 +2439,7 @@ void IMAGE_OT_curves_point_set(wmOperatorType *ot) RNA_def_enum(ot->srna, "point", point_items, 0, "Point", "Set black point or white point for curves"); } +#if 0 /* Not ported to 2.5x yet */ /******************** record composite operator *********************/ typedef struct RecordCompositeData { @@ -2590,6 +2591,8 @@ void IMAGE_OT_record_composite(wmOperatorType *ot) ot->poll = space_image_buffer_exists_poll; } +#endif + /********************* cycle render slot operator *********************/ static int image_cycle_render_slot_poll(bContext *C) diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index ca8270ba0f5..d82a46e9578 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -253,8 +253,6 @@ static void image_operatortypes(void) WM_operatortype_append(IMAGE_OT_sample_line); WM_operatortype_append(IMAGE_OT_curves_point_set); - WM_operatortype_append(IMAGE_OT_record_composite); - WM_operatortype_append(IMAGE_OT_properties); WM_operatortype_append(IMAGE_OT_scopes); } |