[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28278] trunk/blender/source/blender/ editors/space_image/image_ops.c: image operator poll functions for reload and replace now check for a valid image , but not a valid buffer.

[Campbell Barton]

Revision: 28278
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28278
Author:   campbellbarton
Date:     2010-04-19 09:28:23 +0200 (Mon, 19 Apr 2010)

Log Message:
-----------
image operator poll functions for reload and replace now check for a valid image, but not a valid buffer.

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

Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c	2010-04-19 06:20:16 UTC (rev 28277)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2010-04-19 07:28:23 UTC (rev 28278)
@@ -103,12 +103,14 @@
 	sima_zoom_set(sima, ar, sima->zoom*zoomfac);
 }
 
+#if 0 // currently unused
 static int image_poll(bContext *C)
 {
 	return (CTX_data_edit_image(C) != NULL);
 }
+#endif
 
-static int space_image_poll(bContext *C)
+static int space_image_buffer_exists_poll(bContext *C)
 {
 	SpaceImage *sima= CTX_wm_space_image(C);
 	if(sima && sima->spacetype==SPACE_IMAGE)
@@ -119,7 +121,7 @@
 
 static int space_image_file_exists_poll(bContext *C)
 {
-	if(space_image_poll(C)) {
+	if(space_image_buffer_exists_poll(C)) {
 		SpaceImage *sima= CTX_wm_space_image(C);
 		ImBuf *ibuf;
 		void *lock;
@@ -134,6 +136,14 @@
 	return 0;
 }
 
+static int space_image_poll(bContext *C)
+{
+	SpaceImage *sima= CTX_wm_space_image(C);
+	if(sima && sima->spacetype==SPACE_IMAGE && sima->image)
+		return 1;
+	return 0;
+}
+
 int space_image_main_area_poll(bContext *C)
 {
 	SpaceImage *sima= CTX_wm_space_image(C);
@@ -971,7 +981,7 @@
 	/* api callbacks */
 	ot->exec= save_as_exec;
 	ot->invoke= save_as_invoke;
-	ot->poll= space_image_poll;
+	ot->poll= space_image_buffer_exists_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1113,7 +1123,7 @@
 	
 	/* api callbacks */
 	ot->exec= save_sequence_exec;
-	ot->poll= space_image_poll;
+	ot->poll= space_image_buffer_exists_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1146,7 +1156,7 @@
 	
 	/* api callbacks */
 	ot->exec= reload_exec;
-	ot->poll= image_poll;
+	ot->poll= space_image_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1305,7 +1315,7 @@
 	/* api callbacks */
 	ot->exec= pack_exec;
 	ot->invoke= pack_invoke;
-	ot->poll= space_image_poll;
+	ot->poll= space_image_buffer_exists_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1421,7 +1431,7 @@
 	/* api callbacks */
 	ot->exec= unpack_exec;
 	ot->invoke= unpack_invoke;
-	ot->poll= space_image_poll;
+	ot->poll= space_image_buffer_exists_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1911,7 +1921,7 @@
 	ot->invoke= record_composite_invoke;
 	ot->modal= record_composite_modal;
 	ot->cancel= record_composite_cancel;
-	ot->poll= space_image_poll;
+	ot->poll= space_image_buffer_exists_poll;
 }
 
 /********************* cycle render slot operator *********************/