Skip to content

Commit

Permalink
NORMALMAP was not working (no normal being used detected), fixes #9263
Browse files Browse the repository at this point in the history
  • Loading branch information
reduz committed Nov 27, 2018
1 parent 6e1255e commit e6bc152
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions drivers/gles3/shaders/canvas.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit e6bc152

Please sign in to comment.