diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-25 19:02:18 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-25 19:03:13 +0300 |
commit | 973f4944e08c449d68b43edf39d9cb2d209f4b7a (patch) | |
tree | 2c35a02fdcf993dcceb3b06991f5d9d4a9c72749 /source/blender/render | |
parent | 4122eeb09abcc389915c53fd5017dc853e109279 (diff) |
Render API: Rename render > render_to_image; view_draw > render_to_view
This is part of the new draw manager design. Any engine (even clay, eevee, ...) should be able to draw to the viewport, as well as render to an image directly.
Changing the API names to conform to that.
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 8d20e36f82a..7fdaeec20f3 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -93,13 +93,13 @@ typedef struct RenderEngineType { int flag; void (*update)(struct RenderEngine *engine, struct Main *bmain, struct Depsgraph *depsgraph, struct Scene *scene); - void (*render)(struct RenderEngine *engine, struct Depsgraph *depsgraph); + void (*render_to_image)(struct RenderEngine *engine, struct Depsgraph *depsgraph); void (*bake)(struct RenderEngine *engine, struct Scene *scene, 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 (*view_draw)(struct RenderEngine *engine, const struct bContext *context); + void (*render_to_view)(struct RenderEngine *engine, const struct bContext *context); void (*update_script_node)(struct RenderEngine *engine, struct bNodeTree *ntree, struct bNode *node); diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index a274d806d33..61a128b9aae 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -147,7 +147,7 @@ RenderEngineType *RE_engines_find(const char *idname) bool RE_engine_is_external(Render *re) { RenderEngineType *type = RE_engines_find(re->r.engine); - return (type && type->render); + return (type && type->render_to_image); } /* Create, Free */ @@ -616,7 +616,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) + if (!type->render_to_image) return 0; if ((re->r.scemode & R_BUTS_PREVIEW) && !(type->flag & RE_USE_PREVIEW)) return 0; @@ -708,8 +708,8 @@ int RE_engine_render(Render *re, int do_all) re->draw_lock(re->dlh, 0); } - if (type->render) { - type->render(engine, re->depsgraph); + if (type->render_to_image) { + type->render_to_image(engine, re->depsgraph); } engine->tile_x = 0; |