From eaae4b6408361eb34363adcb22a08046f43147f4 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 26 Mar 2020 18:49:16 -0300 Subject: Renamed 2D and 3D nodes to make their types explicit Fixes #30736. --- scene/resources/mesh.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scene/resources/mesh.h') diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index e0cc214301..e5f87dbbe5 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -35,7 +35,7 @@ #include "core/math/triangle_mesh.h" #include "core/resource.h" #include "scene/resources/material.h" -#include "scene/resources/shape.h" +#include "scene/resources/shape_3d.h" #include "servers/visual_server.h" class Mesh : public Resource { @@ -131,8 +131,8 @@ public: void generate_debug_mesh_lines(Vector &r_lines); void generate_debug_mesh_indices(Vector &r_points); - Ref create_trimesh_shape() const; - Ref create_convex_shape() const; + Ref create_trimesh_shape() const; + Ref create_convex_shape() const; Ref create_outline(float p_margin) const; @@ -146,7 +146,7 @@ public: static ConvexDecompositionFunc convex_composition_function; - Vector> convex_decompose() const; + Vector> convex_decompose() const; Mesh(); }; -- cgit v1.2.3