diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-02-19 19:55:01 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-02-19 19:55:01 +0300 |
| commit | e3cc8f00ccd7736227bc40c6a419495918f30759 (patch) | |
| tree | 70c18c0e8064be738264aaa2adff4be791ab914d /source | |
| parent | e86b787bcc8248b94583b1a78ed883150ea2884b (diff) | |
From the todo:
New render output option "No Output", which renders without
forcing an editor to show an image. Nice for people who
prefer to setup composites with background image view.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 341f56667fa..17d05bed24a 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -197,6 +197,9 @@ void screen_set_image_output(bContext *C, int mx, int my) SpaceImage *sima; int area_was_image=0; + if(scene->r.displaymode==R_OUTPUT_NONE) + return; + if(scene->r.displaymode==R_OUTPUT_WINDOW) { rcti rect; int sizex, sizey; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 59d6d3ceba6..e3057e862b8 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -883,7 +883,8 @@ typedef struct Scene { #define R_OUTPUT_SCREEN 0 #define R_OUTPUT_AREA 1 #define R_OUTPUT_WINDOW 2 -/*#define R_OUTPUT_FORKED 3*/ +#define R_OUTPUT_NONE 3 +/*#define R_OUTPUT_FORKED 4*/ /* filtertype */ #define R_FILTER_BOX 0 diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 21c125c8fcc..e7eef76cb11 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1949,6 +1949,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) {R_OUTPUT_SCREEN, "SCREEN", 0, "Full Screen", "Images are rendered in full Screen"}, {R_OUTPUT_AREA, "AREA", 0, "Image Editor", "Images are rendered in Image Editor"}, {R_OUTPUT_WINDOW, "WINDOW", 0, "New Window", "Images are rendered in new Window"}, + {R_OUTPUT_NONE, "NONE", 0, "No Output", "Images are rendered without drawing"}, {0, NULL, 0, NULL, NULL}}; /* Bake */ |