diff options
| author | Juan Linietsky <juan@godotengine.org> | 2019-02-23 20:20:54 -0300 |
|---|---|---|
| committer | Juan Linietsky <juan@godotengine.org> | 2019-02-23 20:20:54 -0300 |
| commit | bfa9be85d38ad935bd4b8198767db3fe1ab1dcda (patch) | |
| tree | db2eda8b61fc836ea98002bfdd24343511f906fa /editor/plugins/spatial_editor_plugin.h | |
| parent | 6cd4006fb3f20ac756517aa0f70720a870f9617a (diff) | |
| download | redot-engine-bfa9be85d38ad935bd4b8198767db3fe1ab1dcda.tar.gz | |
Remove copy and use instance material override in gizmos, fixes #23783
Diffstat (limited to 'editor/plugins/spatial_editor_plugin.h')
| -rw-r--r-- | editor/plugins/spatial_editor_plugin.h | 3 |
1 files changed, 2 insertions, 1 deletions
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); |