diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-01 15:55:59 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-02 16:13:50 +0300 |
| commit | 8c660c780171fe6ddba78b611899fe99064d2a57 (patch) | |
| tree | eabc6a0c7f86d001e8d2b4aa11fc268361c50376 /source/blender/render | |
| parent | 61b77d8948303acb7d8dd038d25004c7774e0052 (diff) | |
Cycles integration with Draw Manager
We can now use object and other modes on top of Cycles.
Since we are now always on "render_to_view" (old Rendered mode), the
pause button is always visible.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/extern/include/RE_engine.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/external_engine.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 7fdaeec20f3..b1add4ee168 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -66,7 +66,7 @@ struct BakePixel; #define RE_USE_TEXTURE_PREVIEW 128 #define RE_USE_SHADING_NODES_CUSTOM 256 #define RE_USE_SPHERICAL_STEREO 512 -#define RE_USE_OGL_PIPELINE 1024 +#define RE_USE_LEGACY_PIPELINE 1024 /* XXX Temporary flag, to be removed once draw manager is finished. */ /* RenderEngine.flag */ #define RE_ENGINE_ANIMATION 1 diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 61a128b9aae..059feae71bc 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -72,7 +72,7 @@ static RenderEngineType internal_render_type = { NULL, NULL, - "BLENDER_RENDER", N_("Blender Render"), RE_INTERNAL, + "BLENDER_RENDER", N_("Blender Render"), RE_INTERNAL | RE_USE_LEGACY_PIPELINE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, {NULL, NULL, NULL} }; @@ -81,7 +81,7 @@ static RenderEngineType internal_render_type = { static RenderEngineType internal_game_type = { NULL, NULL, - "BLENDER_GAME", N_("Blender Game"), RE_INTERNAL | RE_GAME, + "BLENDER_GAME", N_("Blender Game"), RE_INTERNAL | RE_GAME | RE_USE_LEGACY_PIPELINE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, {NULL, NULL, NULL} }; |