Skip to content

Commit 8cbc241

Browse files
committed
Fix meshasset not saving texture card height offset, recalculating density and updating signals
1 parent 5849316 commit 8cbc241

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

project/addons/terrain_3d/src/asset_dock.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -792,8 +792,8 @@ class ListEntry extends VBoxContainer:
792792
var ma := Terrain3DMeshAsset.new()
793793
if resource is Terrain3DMeshAsset:
794794
ma.id = resource.id
795-
ma.set_scene_file(res)
796795
set_edited_resource(ma, false)
796+
ma.set_scene_file(res)
797797
resource = ma
798798
elif res is Terrain3DMeshAsset and type == Terrain3DAssets.TYPE_MESH:
799799
if resource is Terrain3DMeshAsset:

src/terrain_3d_mesh_asset.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ void Terrain3DMeshAsset::_set_generated_type(const GenType p_type) {
2626
LOG(DEBUG, "Generating card mesh");
2727
_meshes.push_back(_get_generated_mesh());
2828
_set_material_override(_get_material());
29-
_height_offset = 0.5f;
30-
_generated_faces = 2;
31-
_relative_density = 10.f;
32-
_calculated_density = 10.f;
3329
}
3430
}
3531

@@ -262,15 +258,18 @@ void Terrain3DMeshAsset::set_scene_file(const Ref<PackedScene> &p_scene_file) {
262258
Ref<Mesh> mesh = _meshes[0];
263259
_calculated_density = CLAMP(10.f / mesh->get_aabb().get_volume(), 0.01f, 10.0f);
264260
_relative_density = _calculated_density;
265-
LOG(DEBUG, "Emitting file_changed");
266-
emit_signal("file_changed");
267261
} else {
268262
LOG(ERROR, "No MeshInstance3D found in scene file");
269263
}
270264
notify_property_list_changed();
271265
} else {
272266
set_generated_type(TYPE_TEXTURE_CARD);
267+
_relative_density = 10.f;
268+
_calculated_density = 10.f;
273269
}
270+
LOG(DEBUG, "Emitting file_changed");
271+
emit_signal("file_changed");
272+
emit_signal("instancer_setting_changed");
274273
}
275274

276275
void Terrain3DMeshAsset::set_material_override(const Ref<Material> &p_material) {

0 commit comments

Comments
 (0)