Page MenuHome
Files F13838

HX16.diff
Public
Actions

Authored By
Bao 2 (bao2)
Nov 13 2013, 2:55 PM
Size
4 KB
Subscribers
None

HX16.diff
View Options

Property changes on: .
___________________________________________________________________
Modified: svn:ignore
- *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
graphicall_32b
graphicall_64b
graphicall_64b_debug
installer_32b
installer_64b
+ *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
graphicall_32b
graphicall_64b
graphicall_64b_debug
installer_32b
installer_64b
compilar
build_ver.sh
Index: source/blender/makesdna/DNA_image_types.h
===================================================================
--- source/blender/makesdna/DNA_image_types.h (revision 33433)
+++ source/blender/makesdna/DNA_image_types.h (working copy)
@@ -77,7 +77,7 @@
struct anim *anim;
struct RenderResult *rr;
- struct RenderResult *renders[8]; /* IMA_MAX_RENDER_SLOT */
+ struct RenderResult *renders[16]; /* IMA_MAX_RENDER_SLOT */
short render_slot, last_render_slot;
short ok, flag;
@@ -132,7 +132,7 @@
/* render */
#define IMA_MAX_RENDER_TEXT 512
-#define IMA_MAX_RENDER_SLOT 8
+#define IMA_MAX_RENDER_SLOT 16
#endif
Index: source/blender/editors/space_image/image_ops.c
===================================================================
--- source/blender/editors/space_image/image_ops.c (revision 33433)
+++ source/blender/editors/space_image/image_ops.c (working copy)
@@ -2120,6 +2120,48 @@
return OPERATOR_FINISHED;
}
+static int cycle_render_slot_exec_backwards(bContext *C, wmOperator *UNUSED(op))
+{
+ Image *ima= CTX_data_edit_image(C);
+ int a, slot, cur= ima->render_slot;
+
+ for(a=1; a<IMA_MAX_RENDER_SLOT; a++) {
+ slot= cur-a; if(slot<0) slot+=IMA_MAX_RENDER_SLOT;
+
+ if(ima->renders[slot] || slot == ima->last_render_slot) {
+ 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)
+ ima->render_slot= 0;
+
+ WM_event_add_notifier(C, NC_IMAGE|ND_DRAW, NULL);
+
+ return OPERATOR_FINISHED;
+}
+
+static int clear_slot(bContext *C, wmOperator *UNUSED(op))
+{
+ Image *ima= CTX_data_edit_image(C);
+ int cur= ima->render_slot;
+
+ if(ima->renders[cur]) {
+ RE_FreeRenderResult(ima->renders[cur]);
+ ima->renders[cur]= NULL;
+ }
+
+ //WM_event_add_notifier(C, NC_IMAGE|ND_DRAW, NULL);
+ cycle_render_slot_exec_backwards(C,NULL);
+
+ return OPERATOR_FINISHED;
+}
+
void IMAGE_OT_cycle_render_slot(wmOperatorType *ot)
{
/* identifiers */
@@ -2134,6 +2176,34 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
+void IMAGE_OT_cycle_render_slot_backwards(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name= "Cycle Render Slot_backwards";
+ ot->idname= "IMAGE_OT_cycle_render_slot_backwards";
+
+ /* api callbacks */
+ ot->exec= cycle_render_slot_exec_backwards;
+ ot->poll= cycle_render_slot_poll;
+
+ /* flags */
+ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+void IMAGE_OT_clear_slot(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name= "Clear Slot";
+ ot->idname= "IMAGE_OT_clear_slot";
+
+ /* api callbacks */
+ ot->exec= clear_slot;
+ ot->poll= cycle_render_slot_poll;
+
+ /* flags */
+ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
/******************** TODO ********************/
/* XXX notifier? */
Index: source/blender/editors/space_image/image_intern.h
===================================================================
--- source/blender/editors/space_image/image_intern.h (revision 33433)
+++ source/blender/editors/space_image/image_intern.h (working copy)
@@ -78,6 +78,8 @@
void IMAGE_OT_unpack(struct wmOperatorType *ot);
void IMAGE_OT_cycle_render_slot(struct wmOperatorType *ot);
+void IMAGE_OT_cycle_render_slot_backwards(struct wmOperatorType *ot);
+void IMAGE_OT_clear_slot(struct wmOperatorType *ot);
void IMAGE_OT_sample(struct wmOperatorType *ot);
void IMAGE_OT_sample_line(struct wmOperatorType *ot);
Index: source/blender/editors/space_image/space_image.c
===================================================================
--- source/blender/editors/space_image/space_image.c (revision 33433)
+++ source/blender/editors/space_image/space_image.c (working copy)
@@ -479,6 +479,8 @@
WM_operatortype_append(IMAGE_OT_unpack);
WM_operatortype_append(IMAGE_OT_cycle_render_slot);
+ WM_operatortype_append(IMAGE_OT_cycle_render_slot_backwards);
+ WM_operatortype_append(IMAGE_OT_clear_slot);
WM_operatortype_append(IMAGE_OT_sample);
WM_operatortype_append(IMAGE_OT_sample_line);
@@ -505,6 +507,8 @@
WM_keymap_add_item(keymap, "IMAGE_OT_scopes", PKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "IMAGE_OT_cycle_render_slot", JKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "IMAGE_OT_cycle_render_slot_backwards", HKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "IMAGE_OT_clear_slot", XKEY, KM_PRESS, 0, 0);
keymap= WM_keymap_find(keyconf, "Image", SPACE_IMAGE, 0);

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
ae/33/d576b2caa652e74969d886969343

Event Timeline