aboutsummaryrefslogtreecommitdiff
path: root/servers/visual_server.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2015-04-09 00:29:21 -0300
committerJuan Linietsky2015-04-09 00:29:21 -0300
commitd148a0384821a05f8714099cf00e1b521643a2ad (patch)
treeb260c213e2c15d8ff4ce9664d784bf0ed39a3935 /servers/visual_server.cpp
parente18c6ef63bb57290b023fde01391f8bdcdfe5aed (diff)
downloadgodot-d148a0384821a05f8714099cf00e1b521643a2ad.tar.gz
godot-d148a0384821a05f8714099cf00e1b521643a2ad.tar.zst
godot-d148a0384821a05f8714099cf00e1b521643a2ad.zip
-Fixes bug in ShaderGraph material, when uniform property is not used, fixes #1634 and #1610
Diffstat (limited to '')
-rw-r--r--servers/visual_server.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp
index 5ddfaf796..1dd078731 100644
--- a/servers/visual_server.cpp
+++ b/servers/visual_server.cpp
@@ -146,7 +146,6 @@ RID VisualServer::_make_test_cube() {
tangents.push_back( normal_points[m_idx][0] );\
tangents.push_back( 1.0 );\
uvs.push_back( Vector3(uv_points[m_idx*2+0],uv_points[m_idx*2+1],0) );\
- print_line(itos( (face_points[m_idx][0]>0?1:0)|(face_points[m_idx][1]>0?2:0)|(face_points[m_idx][2]>0?4:0)));\
vtx_idx++;\
for (int i=0;i<6;i++) {
@@ -207,7 +206,7 @@ RID VisualServer::_make_test_cube() {
//material_set_flag(material, MATERIAL_FLAG_BILLBOARD_TOGGLE,true);
fixed_material_set_texture( material, FIXED_MATERIAL_PARAM_DIFFUSE, get_test_texture() );
fixed_material_set_param( material, FIXED_MATERIAL_PARAM_SPECULAR_EXP, 70 );
- fixed_material_set_param( material, FIXED_MATERIAL_PARAM_EMISSION, Vector3(0.2,0.2,0.2) );
+ fixed_material_set_param( material, FIXED_MATERIAL_PARAM_EMISSION, Color(0.2,0.2,0.2) );
fixed_material_set_param( material, FIXED_MATERIAL_PARAM_DIFFUSE, Color(1, 1, 1) );
fixed_material_set_param( material, FIXED_MATERIAL_PARAM_SPECULAR, Color(1,1,1) );