diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-11-27 18:03:33 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2018-11-27 18:05:20 -0300 |
| commit | e6bc152de8dd2b6b5d58cf2da31606e044a5f49d (patch) | |
| tree | fa3b35c0abd9a283e5b72a0f0eb7d210992810cc | |
| parent | 6e1255ec53172390e89b82c12f2519be4d0ab994 (diff) | |
NORMALMAP was not working (no normal being used detected), fixes #9263
| -rw-r--r-- | drivers/gles3/shaders/canvas.glsl | 1 | ||||
| -rw-r--r-- | editor/editor_node.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl index ef2319c332..86d8cf560e 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 40a7b8310f..8f9c91c008 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<Resource>(current_obj); |