diff options
| author | Toshiwo <info@digitalki.net> | 2018-11-01 10:21:16 -0500 |
|---|---|---|
| committer | Toshiwo <info@digitalki.net> | 2018-11-01 10:21:16 -0500 |
| commit | b27b1a99a029016e9256fb28a04b417855fc4b47 (patch) | |
| tree | e1e5a4fa647d1015cc366d48bf3b9e0c8a072926 | |
| parent | 13eaded911ea1b0c48c0917f156f391ad39b8714 (diff) | |
fixed issue with PrismMesh size, ignore for VS code .code-workspace
| -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 52937b8679..f3655c7b6d 100644 --- a/.gitignore +++ b/.gitignore @@ -310,5 +310,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"); |