[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34453] trunk/blender/source/blender/ editors/space_image/image_ops.c: Fix for [#25664] Remove Pack does not work in Texture panel

Janne Karhu jhkarh at gmail.com
Sat Jan 22 15:44:05 CET 2011


Revision: 34453
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34453
Author:   jhk
Date:     2011-01-22 14:44:04 +0000 (Sat, 22 Jan 2011)
Log Message:
-----------
Fix for [#25664] Remove Pack does not work in Texture panel
* Unpack menu option "Remove Pack" didn't get a pointer to the image to be unpacked. This worked from image view by using the active image, but not from texture panel.

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-01-22 14:13:36 UTC (rev 34452)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2011-01-22 14:44:04 UTC (rev 34453)
@@ -1445,7 +1445,10 @@
 	pup= uiPupMenuBegin(C, "Unpack file", ICON_NULL);
 	layout= uiPupMenuLayout(pup);
 
-	uiItemEnumO(layout, opname, "Remove Pack", 0, "method", PF_REMOVE);
+	sprintf(line, "Remove Pack");
+	props_ptr= uiItemFullO(layout, opname, line, ICON_NULL, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
+	RNA_enum_set(&props_ptr, "method", PF_REMOVE);
+	RNA_string_set(&props_ptr, "image", ima->id.name+2);
 
 	if(strcmp(abs_name, local_name)) {
 		switch(checkPackedFile(local_name, pf)) {




More information about the Bf-blender-cvs mailing list