summaryrefslogtreecommitdiff
path: root/scene/3d/mesh_instance_3d.h
diff options
context:
space:
mode:
authorclayjohn <claynjohn@gmail.com>2021-04-13 20:45:16 -0700
committerclayjohn <claynjohn@gmail.com>2021-04-14 20:24:03 -0700
commit92731d292c66be637b837653044273c7000f63a3 (patch)
tree0b03005c4150a89e09ea49ec64c51662c89a0267 /scene/3d/mesh_instance_3d.h
parentb4b7c97d3839170180e4f3f7c2bd3179b374057a (diff)
Rename get_surface_material to get_surface_override_material
Diffstat (limited to 'scene/3d/mesh_instance_3d.h')
-rw-r--r--scene/3d/mesh_instance_3d.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/3d/mesh_instance_3d.h b/scene/3d/mesh_instance_3d.h
index eb300784b1..8aec227337 100644
--- a/scene/3d/mesh_instance_3d.h
+++ b/scene/3d/mesh_instance_3d.h
@@ -52,7 +52,7 @@ protected:
};
Map<StringName, BlendShapeTrack> blend_shape_tracks;
- Vector<Ref<Material>> materials;
+ Vector<Ref<Material>> surface_override_materials;
void _mesh_changed();
void _resolve_skeleton_path();
@@ -75,9 +75,9 @@ public:
void set_skeleton_path(const NodePath &p_skeleton);
NodePath get_skeleton_path();
- 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;
+ int get_surface_override_material_count() const;
+ void set_surface_override_material(int p_surface, const Ref<Material> &p_material);
+ Ref<Material> get_surface_override_material(int p_surface) const;
Ref<Material> get_active_material(int p_surface) const;
Node *create_trimesh_collision_node();