From bfa9be85d38ad935bd4b8198767db3fe1ab1dcda Mon Sep 17 00:00:00 2001 From: Juan Linietsky <juan@godotengine.org> Date: Sat, 23 Feb 2019 20:20:54 -0300 Subject: Remove copy and use instance material override in gizmos, fixes #23783 --- editor/plugins/spatial_editor_plugin.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'editor/plugins/spatial_editor_plugin.h') diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 364b0085f7..6256b8b055 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -60,6 +60,7 @@ public: RID instance; Ref<ArrayMesh> mesh; + Ref<Material> material; RID skeleton; bool billboard; bool unscaled; @@ -103,7 +104,7 @@ protected: public: void add_lines(const Vector<Vector3> &p_lines, const Ref<Material> &p_material, bool p_billboard = false); - void add_mesh(const Ref<ArrayMesh> &p_mesh, bool p_billboard = false, const RID &p_skeleton = RID()); + void add_mesh(const Ref<ArrayMesh> &p_mesh, bool p_billboard = false, const RID &p_skeleton = RID(), const Ref<Material> &p_material = Ref<Material>()); void add_collision_segments(const Vector<Vector3> &p_lines); void add_collision_triangles(const Ref<TriangleMesh> &p_tmesh); void add_unscaled_billboard(const Ref<Material> &p_material, float p_scale = 1); -- cgit v1.2.3