summaryrefslogtreecommitdiff
path: root/modules/csg/csg_shape.h
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-06-13 17:45:34 +0200
committerGitHub <noreply@github.com>2019-06-13 17:45:34 +0200
commitb2b06dd4a8e45958b57e46bb520778f334bc1f5d (patch)
treeb4ada305acb0d4ce488cdb954325c62109958891 /modules/csg/csg_shape.h
parent48fb3debf66af3bb3e6bea5be10c3178f2861d85 (diff)
parent051ef5ead297a577a54b49f2f964144ff8841214 (diff)
Merge pull request #29749 from JFonS/add_csg_navmesh
Take CSG into account for nav-mesh generation
Diffstat (limited to 'modules/csg/csg_shape.h')
-rw-r--r--modules/csg/csg_shape.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/csg/csg_shape.h b/modules/csg/csg_shape.h
index a5b2238e6b..2171f27f96 100644
--- a/modules/csg/csg_shape.h
+++ b/modules/csg/csg_shape.h
@@ -116,9 +116,9 @@ protected:
virtual void _validate_property(PropertyInfo &property) const;
+public:
Array get_meshes() const;
-public:
void set_operation(Operation p_operation);
Operation get_operation() const;