From dd3682e5feb433117fbf62c363c7ba6ff214f8fa Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 15 Sep 2019 01:01:52 -0300 Subject: Modernized default 3D material, fixes material bugs. --- scene/3d/mesh_instance.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scene/3d/mesh_instance.cpp') diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index e14fa9e9af..4731210768 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -101,7 +101,7 @@ void MeshInstance::_get_property_list(List *p_list) const { if (mesh.is_valid()) { for (int i = 0; i < mesh->get_surface_count(); i++) { - p_list->push_back(PropertyInfo(Variant::OBJECT, "material/" + itos(i), PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,SpatialMaterial")); + p_list->push_back(PropertyInfo(Variant::OBJECT, "material/" + itos(i), PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,StandardMaterial3D")); } } } @@ -355,12 +355,12 @@ void MeshInstance::create_debug_tangents() { if (lines.size()) { - Ref sm; + Ref sm; sm.instance(); - sm->set_flag(SpatialMaterial::FLAG_UNSHADED, true); - sm->set_flag(SpatialMaterial::FLAG_SRGB_VERTEX_COLOR, true); - sm->set_flag(SpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR, true); + sm->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED); + sm->set_flag(StandardMaterial3D::FLAG_SRGB_VERTEX_COLOR, true); + sm->set_flag(StandardMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true); Ref am; am.instance(); -- cgit v1.2.3 From da0457fa29e1ea63f89b1e1d73e72c4dc80a9966 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 31 Oct 2019 19:54:21 -0300 Subject: Several fixes to GIProbes --- scene/3d/mesh_instance.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'scene/3d/mesh_instance.cpp') diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index 4731210768..08290fe6c3 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -409,6 +409,7 @@ void MeshInstance::_bind_methods() { ClassDB::set_method_flags("MeshInstance", "create_debug_tangents", METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh"); + ADD_GROUP("Skeleton", ""); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_skin", "get_skin"); ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "skeleton", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Skeleton"), "set_skeleton_path", "get_skeleton_path"); } -- cgit v1.2.3 From f4c5e88ef2d5eef16bbaf11180bb2d251f6fcf49 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Fri, 1 Nov 2019 00:35:26 -0300 Subject: Fix to category in material. --- scene/3d/mesh_instance.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'scene/3d/mesh_instance.cpp') diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index 08290fe6c3..6d0216d99c 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -412,6 +412,7 @@ void MeshInstance::_bind_methods() { ADD_GROUP("Skeleton", ""); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_skin", "get_skin"); ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "skeleton", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Skeleton"), "set_skeleton_path", "get_skeleton_path"); + ADD_GROUP("", ""); } MeshInstance::MeshInstance() { -- cgit v1.2.3