diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-16 22:24:04 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-16 22:24:04 +0300 |
| commit | ad01c90ee3942fb2a4a792f0454a136b441f42b4 (patch) | |
| tree | f0468981d9f46ae32b386d36ab34d1d9bbda9a2f /source/blender/editors/space_image/image_ops.c | |
| parent | a4c010975a6afaecc2ca8f8284de3febda113369 (diff) | |
Revert render slots commit for release, I can't find the bug or even redo
it myself, there will still be render slots just old implementation.
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index eb87b5656bf..b69b6a552a6 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1805,21 +1805,21 @@ static int cycle_render_slot_poll(bContext *C) static int cycle_render_slot_exec(bContext *C, wmOperator *op) { - Image *ima= CTX_data_edit_image(C); - int a, slot, cur= ima->render_slot; + Scene *scene= CTX_data_scene(C); + int a, slot, cur= RE_GetViewSlot(); - for(a=1; a<IMA_MAX_RENDER_SLOT; a++) { - slot= (cur+a)%IMA_MAX_RENDER_SLOT; + for(a=1; a<RE_SLOT_MAX; a++) { + slot= (cur+a)%RE_SLOT_MAX; - if(ima->renders[slot] || slot == ima->last_render_slot) { - ima->render_slot= slot; + if(RE_GetRender(scene->id.name, slot)) { + RE_SetViewSlot(slot); break; } } - if(a == IMA_MAX_RENDER_SLOT) - ima->render_slot= ((cur == 1)? 0: 1); - + if(a == RE_SLOT_MAX) + RE_SetViewSlot((cur == 1)? 0: 1); + WM_event_add_notifier(C, NC_IMAGE|ND_DRAW, NULL); return OPERATOR_FINISHED; |