diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-30 15:32:47 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-30 19:17:49 +0300 |
commit | 08862b8246b49331ddfb7ed6812c9e31989bf8b1 (patch) | |
tree | cdb01c144101c0be9878538c1bc1ef3026929250 /source/blender/editors | |
parent | 85ce4d957cee0de45b620d30af4061253ff8b18f (diff) |
Render API: rename some API functions back to earlier names.
Their purpose is the same, no reason to break API compatibility here.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw_legacy.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 4e44c9b1185..9c56f4f7754 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -314,7 +314,7 @@ static int screen_render_exec(bContext *C, wmOperator *op) struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL; /* Cannot do render if there is not this function. */ - if (re_type->render_to_image == NULL) { + if (re_type->render == NULL) { return OPERATOR_CANCELLED; } @@ -883,7 +883,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even ScrArea *sa; /* Cannot do render if there is not this function. */ - if (re_type->render_to_image == NULL) { + if (re_type->render == NULL) { return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index 8505de4c7e0..3a89c910ea8 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -1032,7 +1032,7 @@ void ED_scene_draw_fps(Scene *scene, const rcti *rect) static bool view3d_main_region_do_render_draw(const Scene *scene) { RenderEngineType *type = RE_engines_find(scene->r.engine); - return (type && type->view_update && type->render_to_view); + return (type && type->view_update && type->view_draw); } bool ED_view3d_calc_render_border(const Scene *scene, Depsgraph *depsgraph, View3D *v3d, ARegion *ar, rcti *rect) |