[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35962] trunk/blender/source/blender/ editors/space_image/image_ops.c: Bugfix #26736

Ton Roosendaal ton at blender.org
Sat Apr 2 17:30:58 CEST 2011


Revision: 35962
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35962
Author:   ton
Date:     2011-04-02 15:30:58 +0000 (Sat, 02 Apr 2011)
Log Message:
-----------
Bugfix #26736

Operator "New Image" cannot be redone simply, undo system keeps images
around, and each redo will create new block. Removed it from being
registered for redos.

Also: fix up for default operator names to be complete, and not just
"new" or "load". If we want contextual shortening of operator names
(like in Image menu), that should be handled seprately, automatically,
or anything we can sanely come up with that will suit any possible
language as well.

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	2011-04-02 14:58:58 UTC (rev 35961)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2011-04-02 15:30:58 UTC (rev 35962)
@@ -798,7 +798,7 @@
 void IMAGE_OT_open(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Open";
+	ot->name= "Open Image";
 	ot->idname= "IMAGE_OT_open";
 	
 	/* api callbacks */
@@ -856,7 +856,7 @@
 void IMAGE_OT_replace(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Replace";
+	ot->name= "Replace Image";
 	ot->idname= "IMAGE_OT_replace";
 	
 	/* api callbacks */
@@ -1076,7 +1076,7 @@
 void IMAGE_OT_save_as(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Save As";
+	ot->name= "Save As Image";
 	ot->idname= "IMAGE_OT_save_as";
 	
 	/* api callbacks */
@@ -1147,7 +1147,7 @@
 void IMAGE_OT_save(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Save";
+	ot->name= "Save Image";
 	ot->idname= "IMAGE_OT_save";
 	
 	/* api callbacks */
@@ -1259,7 +1259,7 @@
 void IMAGE_OT_reload(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Reload";
+	ot->name= "Reload Image";
 	ot->idname= "IMAGE_OT_reload";
 	
 	/* api callbacks */
@@ -1341,7 +1341,7 @@
 	static float default_color[4]= {0.0f, 0.0f, 0.0f, 1.0f};
 	
 	/* identifiers */
-	ot->name= "New";
+	ot->name= "New Image";
 	ot->idname= "IMAGE_OT_new";
 	
 	/* api callbacks */
@@ -1349,7 +1349,7 @@
 	ot->invoke= image_new_invoke;
 	
 	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag= OPTYPE_UNDO;
 
 	/* properties */
 	RNA_def_string(ot->srna, "name", "untitled", 21, "Name", "Image datablock name.");
@@ -1514,7 +1514,7 @@
 void IMAGE_OT_pack(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Pack";
+	ot->name= "Pack Image";
 	ot->description= "Pack an image as embedded data into the .blend file"; 
 	ot->idname= "IMAGE_OT_pack";
 	
@@ -1591,7 +1591,7 @@
 void IMAGE_OT_unpack(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Unpack";
+	ot->name= "Unpack Image";
 	ot->description= "Save an image packed in the .blend file to disk"; 
 	ot->idname= "IMAGE_OT_unpack";
 	
@@ -1803,7 +1803,7 @@
 void IMAGE_OT_sample(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Sample";
+	ot->name= "Sample Color";
 	ot->idname= "IMAGE_OT_sample";
 	
 	/* api callbacks */




More information about the Bf-blender-cvs mailing list