diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-11 04:22:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-11 04:22:10 +0400 |
| commit | 32c7e22d3696e3575f4b7d05c1f7140591e88809 (patch) | |
| tree | 44d501cb62aebd638a7f7b5d0306ecc03e0deb5f /source/blender/editors/render/render_intern.h | |
| parent | dfcd01553536d63dab1037d0ea289b9d9d90c39c (diff) | |
| parent | 6fb82a85c9a48c9fad6cb7b42994a9cd7b2b491a (diff) | |
Merged changes in the trunk up to revision 37388.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
Diffstat (limited to 'source/blender/editors/render/render_intern.h')
| -rw-r--r-- | source/blender/editors/render/render_intern.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h index 7474c7ff7b6..a2167eb95ad 100644 --- a/source/blender/editors/render/render_intern.h +++ b/source/blender/editors/render/render_intern.h @@ -77,13 +77,16 @@ void TEXTURE_OT_envmap_clear(struct wmOperatorType *ot); void TEXTURE_OT_envmap_clear_all(struct wmOperatorType *ot); /* render_internal.c */ -void RENDER_OT_view_show(struct wmOperatorType *ot); void RENDER_OT_render(struct wmOperatorType *ot); -void RENDER_OT_view_cancel(struct wmOperatorType *ot); -/*render_opengl.c uses these */ +/* render_opengl.c uses this */ void image_buffer_rect_update(struct Scene *scene, struct RenderResult *rr, struct ImBuf *ibuf, volatile struct rcti *renrect); -void screen_set_image_output(struct bContext *C, int mx, int my); + +/* render_view.c */ +void render_view_open(struct bContext *C, int mx, int my); + +void RENDER_OT_view_show(struct wmOperatorType *ot); +void RENDER_OT_view_cancel(struct wmOperatorType *ot); /* render_opengl.c */ void RENDER_OT_opengl(struct wmOperatorType *ot); |