diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2020-01-28 18:10:37 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2020-01-28 18:10:37 +0300 |
commit | 38f3a85649088119436a89161fadf7e217b8b040 (patch) | |
tree | 5a6c1f69242718145afb6cfa0929839fc1c1e750 /source/blender/editors/interface | |
parent | 7038a3a774cab845300e32745acb4439eb913b55 (diff) | |
parent | 864cb7f376816ccd05e6e143dab668329b070faa (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index c43b7385a36..4c86e3252ed 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -72,6 +72,7 @@ #include "BKE_particle.h" #include "BKE_curveprofile.h" #include "BKE_report.h" +#include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_shader_fx.h" @@ -2845,8 +2846,13 @@ void uiTemplatePreview(uiLayout *layout, col = uiLayoutColumn(row, true); uiLayoutSetScaleX(col, 1.5); uiItemR(col, &material_ptr, "preview_render_type", UI_ITEM_R_EXPAND, "", ICON_NONE); - uiItemS(col); - uiItemR(col, &material_ptr, "use_preview_world", 0, "", ICON_WORLD); + + /* EEVEE preview file has baked lighting so use_preview_world has no effect, + * just hide the option until this feature is supported. */ + if (!BKE_scene_uses_blender_eevee(CTX_data_scene(C))) { + uiItemS(col); + uiItemR(col, &material_ptr, "use_preview_world", 0, "", ICON_WORLD); + } } if (pr_texture) { |