diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-02-27 15:21:54 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-02-27 15:31:16 +0300 |
| commit | 12c8fef8c7259bfdae367900f5a85f9b42e8d541 (patch) | |
| tree | cf55808421c68c77504957e195ee17a30d354615 | |
| parent | 3d7235fc8787c8f63ead313f0a891600dbc4d6fa (diff) | |
Eevee preview materials
Now that Eevee has support for offline rendering (F12) we can use it for
the Material previews.
Note: This makes the duplicated UI issue one panel worse. That happens when
Cycles if your scene engine, and Eevee is your workspace engine.
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_material.py | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_engine.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index 2dc7bffa527..dfbf3eab244 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -183,7 +183,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel, Panel): class MATERIAL_PT_preview(MaterialButtonsPanel, Panel): bl_label = "Preview" - COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_EEVEE'} def draw(self, context): self.layout.template_preview(context.material) diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 591ee9085c8..ded927d19f7 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -504,7 +504,7 @@ DrawEngineType draw_engine_eevee_type = { RenderEngineType DRW_engine_viewport_eevee_type = { NULL, NULL, - EEVEE_ENGINE, N_("Eevee"), RE_INTERNAL | RE_USE_SHADING_NODES, + EEVEE_ENGINE, N_("Eevee"), RE_INTERNAL | RE_USE_SHADING_NODES | RE_USE_PREVIEW, NULL, &DRW_render_to_image, NULL, NULL, NULL, NULL, &EEVEE_render_update_passes, &eevee_layer_collection_settings_create, diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index c76a6aa175a..79562ae386b 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -1376,7 +1376,7 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M sp->bmain = CTX_data_main(C); sp->view_render = view_render; - /* hardcoded preview .blend for cycles/internal, this should be solved + /* hardcoded preview .blend for Eevee + cycles/internal, this should be solved * once with custom preview .blend path for external engines */ if ((method != PR_NODE_RENDER) && id_type != ID_TE && use_new_shading) { sp->pr_main = G_pr_main_cycles; |