diff options
author | Thomas Dinges <blender@dingto.org> | 2021-11-09 17:08:37 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2021-11-09 17:08:37 +0300 |
commit | accdd4c1bc2deb20bd72f4697dbb356d5472fde2 (patch) | |
tree | 2aae1bfdfbe406ba82d780ee0d0d2cc5d554ac76 | |
parent | 625349a6bd03f9af20a7f37814c8a91b02fa7d5c (diff) | |
parent | 41607ced2bafa41269b5c06b3a4b2fc574d5ac83 (diff) |
Merge branch 'blender-v3.0-release'
-rw-r--r-- | source/blender/editors/space_node/drawnode.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc index fe866a81f67..d903e9ee984 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -39,6 +39,7 @@ #include "BKE_image.h" #include "BKE_main.h" #include "BKE_node.h" +#include "BKE_scene.h" #include "BKE_tracking.h" #include "BLF_api.h" @@ -811,7 +812,7 @@ static void node_shader_buts_tex_environment_ex(uiLayout *layout, bContext *C, P uiItemR(layout, ptr, "projection", DEFAULT_FLAGS, IFACE_("Projection"), ICON_NONE); } -static void node_shader_buts_tex_sky(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_sky(uiLayout *layout, bContext *C, PointerRNA *ptr) { uiItemR(layout, ptr, "sky_type", DEFAULT_FLAGS, "", ICON_NONE); @@ -825,6 +826,10 @@ static void node_shader_buts_tex_sky(uiLayout *layout, bContext *UNUSED(C), Poin uiItemR(layout, ptr, "ground_albedo", DEFAULT_FLAGS, nullptr, ICON_NONE); } if (RNA_enum_get(ptr, "sky_type") == SHD_SKY_NISHITA) { + Scene *scene = CTX_data_scene(C); + if (BKE_scene_uses_blender_eevee(scene)) { + uiItemL(layout, TIP_("Nishita not available in Eevee"), ICON_ERROR); + } uiItemR(layout, ptr, "sun_disc", DEFAULT_FLAGS, nullptr, 0); uiLayout *col; |