summaryrefslogtreecommitdiff
path: root/scene/3d/mesh_instance_3d.h
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-03-31 18:03:11 +0200
committerGitHub <noreply@github.com>2020-03-31 18:03:11 +0200
commita30bfe5176aba20836bce58bcaf508d26234cae0 (patch)
tree9790f08a9392db664c700a62253b66bcc33df8c6 /scene/3d/mesh_instance_3d.h
parent3a996faeedda9fa411693a5973d3a56c703e81d8 (diff)
parent3362e81674e2c149fe326430ff414ae344d26e19 (diff)
Merge pull request #35765 from clayjohn/master
Add a method to retrieve active material from MeshInstance
Diffstat (limited to 'scene/3d/mesh_instance_3d.h')
-rw-r--r--scene/3d/mesh_instance_3d.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/scene/3d/mesh_instance_3d.h b/scene/3d/mesh_instance_3d.h
index e45f68e295..914148f427 100644
--- a/scene/3d/mesh_instance_3d.h
+++ b/scene/3d/mesh_instance_3d.h
@@ -84,6 +84,7 @@ public:
int get_surface_material_count() const;
void set_surface_material(int p_surface, const Ref<Material> &p_material);
Ref<Material> get_surface_material(int p_surface) const;
+ Ref<Material> get_active_material(int p_surface) const;
Node *create_trimesh_collision_node();
void create_trimesh_collision();