diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-02 08:08:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-02 08:08:17 +0100 |
| commit | c025f526c8fd4b96fb12a0a7e2141f59997e80d1 (patch) | |
| tree | 9890d2da7e929c90d45b75f1d8451515f7e3b7ca | |
| parent | 0e27af280c0c1481f9a21dbad82ed945bb947c28 (diff) | |
| parent | b27b1a99a029016e9256fb28a04b417855fc4b47 (diff) | |
Merge pull request #23436 from Toshiwoz/primitives_properties
fixed PrismMesh size property
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | scene/resources/primitive_meshes.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 3a05ed9e7d..fe504482b3 100644 --- a/.gitignore +++ b/.gitignore @@ -311,5 +311,8 @@ platform/windows/godot_res.res /.vs /.vscode +# Visual Studio Code workspace file +*.code-workspace + # Scons progress indicator .scons_node_count diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index 63aa44e1d8..28af3d3220 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -1282,7 +1282,7 @@ void PrismMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("get_subdivide_depth"), &PrismMesh::get_subdivide_depth); ADD_PROPERTY(PropertyInfo(Variant::REAL, "left_to_right", PROPERTY_HINT_RANGE, "-2.0,2.0,0.1"), "set_left_to_right", "get_left_to_right"); - ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "size"), "set_size", "get_size"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "size"), "set_size", "get_size"); ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_width", "get_subdivide_width"); ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_height", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_height", "get_subdivide_height"); ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_depth", "get_subdivide_depth"); |