From e6bc152de8dd2b6b5d58cf2da31606e044a5f49d Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 27 Nov 2018 18:03:33 -0300 Subject: [PATCH] NORMALMAP was not working (no normal being used detected), fixes #9263 --- drivers/gles3/shaders/canvas.glsl | 1 + editor/editor_node.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl index ef2319c332f4..86d8cf560e71 100644 --- a/drivers/gles3/shaders/canvas.glsl +++ b/drivers/gles3/shaders/canvas.glsl @@ -477,6 +477,7 @@ void main() { #if defined(NORMALMAP_USED) vec3 normal_map = vec3(0.0, 0.0, 1.0); + normal_used=true; #endif /* clang-format off */ diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 40a7b8310f7b..8f9c91c008a6 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1452,7 +1452,7 @@ void EditorNode::_edit_current() { bool is_node = current_obj->is_class("Node"); String editable_warning; //none by default - + if (is_resource) { Resource *current_res = Object::cast_to(current_obj);