diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-23 12:11:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-23 12:11:07 +0200 |
| commit | e3014467e4e5c53b9cf072c3fb26c079fbe24104 (patch) | |
| tree | 9971f236d0118192b98c378a691c49d3d4acc6a7 /editor | |
| parent | 92aafa898fba31b417093de75cf681ae60fdaf7f (diff) | |
| parent | 927f9f283f5152d4f7318850ccd8194e74996a3b (diff) | |
Merge pull request #21313 from JFonS/gizmo_enabling
Remove material errors after opening new project, fixes #21073
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/spatial_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 7ad117deb6..906c51b9f6 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -5664,7 +5664,7 @@ SpatialEditorPlugin::~SpatialEditorPlugin() { void EditorSpatialGizmoPlugin::create_material(const String &p_name, const Color &p_color, bool p_billboard, bool p_on_top, bool p_use_vertex_color) { - Color instanced_color = EDITOR_GET("editors/3d_gizmos/gizmo_colors/instanced"); + Color instanced_color = EDITOR_DEF("editors/3d_gizmos/gizmo_colors/instanced", Color(0.7, 0.7, 0.7, 0.5)); Vector<Ref<SpatialMaterial> > mats; @@ -5706,7 +5706,7 @@ void EditorSpatialGizmoPlugin::create_material(const String &p_name, const Color void EditorSpatialGizmoPlugin::create_icon_material(const String &p_name, const Ref<Texture> &p_texture, bool p_on_top, const Color &p_albedo) { - Color instanced_color = EDITOR_GET("editors/3d_gizmos/gizmo_colors/instanced"); + Color instanced_color = EDITOR_DEF("editors/3d_gizmos/gizmo_colors/instanced", Color(0.7, 0.7, 0.7, 0.5)); Vector<Ref<SpatialMaterial> > icons; |