[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45295] trunk/blender/source/blender/ editors/space_image: Image editor: shortcuts 1-key to 8-key for switching between render slots, patch

[Brecht Van Lommel]

Revision: 45295
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45295
Author:   blendix
Date:     2012-03-30 16:09:12 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
Image editor: shortcuts 1-key to 8-key for switching between render slots, patch
by Damir Prebeg.

Also changed back J-key slot switching to only cycle through used slots, not used
slots + 1. This is much more useful to compare two renders easily, rather than being
shown an empty slot each time.

Modified Paths:
--------------
    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_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c	2012-03-30 16:09:05 UTC (rev 45294)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2012-03-30 16:09:12 UTC (rev 45295)
@@ -2350,10 +2350,6 @@
 			ima->render_slot = slot;
 			break;
 		}
-		else if ((slot - 1) == ima->last_render_slot && slot < IMA_MAX_RENDER_SLOT) {
-			ima->render_slot = slot;
-			break;
-		}
 	}
 
 	if (a == IMA_MAX_RENDER_SLOT)

Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c	2012-03-30 16:09:05 UTC (rev 45294)
+++ trunk/blender/source/blender/editors/space_image/space_image.c	2012-03-30 16:09:12 UTC (rev 45295)
@@ -497,6 +497,7 @@
 {
 	wmKeyMap *keymap = WM_keymap_find(keyconf, "Image Generic", SPACE_IMAGE, 0);
 	wmKeyMapItem *kmi;
+	int i;
 	
 	WM_keymap_add_item(keymap, "IMAGE_OT_new", NKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "IMAGE_OT_open", OKEY, KM_PRESS, KM_ALT, 0);
@@ -543,6 +544,13 @@
 	kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, 0, 0);
 	RNA_enum_set(kmi->ptr, "mode", OB_MODE_EDIT);
 	RNA_boolean_set(kmi->ptr, "toggle", TRUE);
+
+	/* fast switch to render slots */
+	for(i = 0; i < MAX2(IMA_MAX_RENDER_SLOT, 9); i++) {
+		kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_int", ONEKEY+i, KM_PRESS, 0, 0);
+		RNA_string_set(kmi->ptr, "data_path", "space_data.image.render_slot");
+		RNA_int_set(kmi->ptr, "value", i);
+	}
 }
 
 /* dropboxes */