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/render | |
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/render')
-rw-r--r-- | source/blender/render/extern/include/RE_engine.h | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/external_engine.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 59a754fcde4..3cf048e21ba 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -93,14 +93,14 @@ typedef struct RenderEngineType { int flag; void (*update)(struct RenderEngine *engine, struct Main *bmain, struct Depsgraph *depsgraph); - void (*render_to_image)(struct RenderEngine *engine, struct Depsgraph *depsgraph); + void (*render)(struct RenderEngine *engine, struct Depsgraph *depsgraph); void (*bake)(struct RenderEngine *engine, struct Depsgraph *depsgraph, struct Object *object, const int pass_type, const int pass_filter, const int object_id, const struct BakePixel *pixel_array, const int num_pixels, const int depth, void *result); void (*view_update)(struct RenderEngine *engine, const struct bContext *context); - void (*render_to_view)(struct RenderEngine *engine, const struct bContext *context); + void (*view_draw)(struct RenderEngine *engine, const struct bContext *context); void (*update_script_node)(struct RenderEngine *engine, struct bNodeTree *ntree, struct bNode *node); void (*update_render_passes)(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer); diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 7655645f1e7..afdb8c5dd65 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -122,7 +122,7 @@ RenderEngineType *RE_engines_find(const char *idname) bool RE_engine_is_external(Render *re) { - return (re->engine && re->engine->type && re->engine->type->render_to_image); + return (re->engine && re->engine->type && re->engine->type->render); } bool RE_engine_is_opengl(RenderEngineType *render_type) @@ -632,7 +632,7 @@ int RE_engine_render(Render *re, int do_all) bool persistent_data = (re->r.mode & R_PERSISTENT_DATA) != 0; /* verify if we can render */ - if (!type->render_to_image) + if (!type->render) return 0; if ((re->r.scemode & R_BUTS_PREVIEW) && !(type->flag & RE_USE_PREVIEW)) return 0; @@ -719,7 +719,7 @@ int RE_engine_render(Render *re, int do_all) re->draw_lock(re->dlh, 0); } - if (type->render_to_image) { + if (type->render) { FOREACH_VIEW_LAYER_TO_RENDER_BEGIN(re, view_layer_iter) { if (re->draw_lock) { @@ -737,7 +737,7 @@ int RE_engine_render(Render *re, int do_all) re->draw_lock(re->dlh, 0); } - type->render_to_image(engine, engine->depsgraph); + type->render(engine, engine->depsgraph); engine_depsgraph_free(engine); } |