Browse Source

NORMALMAP was not working (no normal being used detected), fixes #9263

Juan Linietsky 6 years ago
parent
commit
e6bc152de8
2 changed files with 2 additions and 1 deletions
  1. 1 0
      drivers/gles3/shaders/canvas.glsl
  2. 1 1
      editor/editor_node.cpp

+ 1 - 0
drivers/gles3/shaders/canvas.glsl

@@ -477,6 +477,7 @@ void main() {
 
 
 #if defined(NORMALMAP_USED)
 #if defined(NORMALMAP_USED)
 		vec3 normal_map = vec3(0.0, 0.0, 1.0);
 		vec3 normal_map = vec3(0.0, 0.0, 1.0);
+		normal_used=true;
 #endif
 #endif
 
 
 		/* clang-format off */
 		/* clang-format off */

+ 1 - 1
editor/editor_node.cpp

@@ -1452,7 +1452,7 @@ void EditorNode::_edit_current() {
 	bool is_node = current_obj->is_class("Node");
 	bool is_node = current_obj->is_class("Node");
 
 
 	String editable_warning; //none by default
 	String editable_warning; //none by default
-
+	
 	if (is_resource) {
 	if (is_resource) {
 
 
 		Resource *current_res = Object::cast_to<Resource>(current_obj);
 		Resource *current_res = Object::cast_to<Resource>(current_obj);