[Bf-blender-cvs] [41607ced2ba] blender-v3.0-release: Node Editor: Display warning when using Nishita sky texture with Eevee

Thomas Dinges noreply at git.blender.org
Tue Nov 9 15:07:49 CET 2021


Commit: 41607ced2bafa41269b5c06b3a4b2fc574d5ac83
Author: Thomas Dinges
Date:   Tue Nov 9 15:06:18 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB41607ced2bafa41269b5c06b3a4b2fc574d5ac83

Node Editor: Display warning when using Nishita sky texture with Eevee

Nishita sky is not available in Eevee, display a warning to make this clear inside the Sky texture node.

Differential Revision: https://developer.blender.org/D13161

===================================================================

M	source/blender/editors/space_node/drawnode.cc

===================================================================

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;



More information about the Bf-blender-cvs mailing list