[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54948] trunk/blender/source/blender/ editors/space_image: Fix / Workaround for [#34474] "Record Composite" image op segfaults in compositor code

Thomas Dinges blender at dingto.org
Thu Feb 28 23:50:25 CET 2013


Revision: 54948
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54948
Author:   dingto
Date:     2013-02-28 22:50:24 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
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). 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_intern.h
    trunk/blender/source/blender/editors/space_image/image_ops.c
    trunk/blender/source/blender/editors/space_image/space_image.c

Modified: trunk/blender/source/blender/editors/space_image/image_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_intern.h	2013-02-28 18:28:08 UTC (rev 54947)
+++ trunk/blender/source/blender/editors/space_image/image_intern.h	2013-02-28 22:50:24 UTC (rev 54948)
@@ -87,8 +87,6 @@
 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);

Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c	2013-02-28 18:28:08 UTC (rev 54947)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2013-02-28 22:50:24 UTC (rev 54948)
@@ -2439,6 +2439,7 @@
 	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 @@
 	ot->poll = space_image_buffer_exists_poll;
 }
 
+#endif
+
 /********************* cycle render slot operator *********************/
 
 static int image_cycle_render_slot_poll(bContext *C)

Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c	2013-02-28 18:28:08 UTC (rev 54947)
+++ trunk/blender/source/blender/editors/space_image/space_image.c	2013-02-28 22:50:24 UTC (rev 54948)
@@ -253,8 +253,6 @@
 	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);
 }




More information about the Bf-blender-cvs mailing list