Fix / Workaround for [#34474] "Record Composite" image op segfaults in compositor...
authorThomas Dinges <blender@dingto.org>
Thu, 28 Feb 2013 22:50:24 +0000 (22:50 +0000)
committerThomas Dinges <blender@dingto.org>
Thu, 28 Feb 2013 22:50:24 +0000 (22:50 +0000)
* These operators have never been ported to 2.5x and therefore should not come up inside the UI. (as they are not working).

source/blender/editors/space_image/image_intern.h
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c

index f86e59c41a81cfbe67aaa6312011bab09ac1a086..5184b1e1a738940d93c5ec9404dbfd04f88a207d 100644 (file)
@@ -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);
index 61dd457f2af59672c6e3a2db97eb6cd62acbbcb7..b913b3528ace7e64ce78114cf9e5f56ccda357f1 100644 (file)
@@ -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)
index ca8270ba0f57d27b4cbb30142bbdc4fbf1ea2d37..d82a46e95785b468b382aaf602a73d5ad7cf5713 100644 (file)
@@ -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);
 }