diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2e268195..17914ca3 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -15,7 +15,7 @@ } }, "command": [ - "scons werror=no compiledb=yes dev_build=no generate_bundle=no precision=double target=editor tests=yes debug_symbols=yes" + "scons werror=no compiledb=yes dev_build=no generate_bundle=no vulkan=no precision=double target=editor tests=yes debug_symbols=yes" ], }, ] diff --git a/godot/.gitrepo b/godot/.gitrepo index 5a910060..e5b1d013 100644 --- a/godot/.gitrepo +++ b/godot/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/V-Sekai/godot.git branch = groups-4.4 - commit = 8cfa43ae7e2a7c0db1d178adaa8e2b6983c4cb4b - parent = 02cbf86c45f5db1352177f8a5046e74fdcc8a151 + commit = 8e39fd31cf40d0ac9666252fe514e7b7bdca11d8 + parent = 401b48e4509fd58f7dd1dcea1c668b90ef221d70 method = merge cmdver = 0.4.9 diff --git a/godot/modules/csg/csg_shape.cpp b/godot/modules/csg/csg_shape.cpp index cc459592..7b6f79e7 100644 --- a/godot/modules/csg/csg_shape.cpp +++ b/godot/modules/csg/csg_shape.cpp @@ -246,7 +246,6 @@ static void _pack_manifold( } manifold::MeshGL64 mesh; - mesh.tolerance = p_snap; mesh.numProp = MANIFOLD_PROPERTY_MAX; mesh.runOriginalID.reserve(faces_by_material.size()); mesh.runIndex.reserve(faces_by_material.size() + 1); @@ -864,7 +863,7 @@ void CSGShape3D::_bind_methods() { ClassDB::bind_method(D_METHOD("bake_collision_shape"), &CSGShape3D::bake_collision_shape); ADD_PROPERTY(PropertyInfo(Variant::INT, "operation", PROPERTY_HINT_ENUM, "Union,Intersection,Subtraction"), "set_operation", "get_operation"); - ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "snap", PROPERTY_HINT_RANGE, "0.000001,1,0.000001,suffix:m"), "set_snap", "get_snap"); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "snap", PROPERTY_HINT_RANGE, "0.000001,1,0.000001,suffix:m", PROPERTY_USAGE_NO_EDITOR), "set_snap", "get_snap"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "calculate_tangents"), "set_calculate_tangents", "is_calculating_tangents"); ADD_GROUP("Collision", "collision_"); diff --git a/godot/modules/csg/doc_classes/CSGShape3D.xml b/godot/modules/csg/doc_classes/CSGShape3D.xml index ac62d8dd..6c0676dc 100644 --- a/godot/modules/csg/doc_classes/CSGShape3D.xml +++ b/godot/modules/csg/doc_classes/CSGShape3D.xml @@ -89,7 +89,7 @@ The operation that is performed on this shape. This is ignored for the first CSG child node as the operation is between this node and the previous child of this nodes parent. - + Snap makes the mesh vertices snap to a given distance so that the faces of two meshes can be perfectly aligned. A lower value results in greater precision but may be harder to adjust. The top-level CSG shape's snap value is used for the entire CSG tree.