Skip to content

Prevent infinite loop when cancelling load custom mesh dialog #1530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williamchange wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent infinite loop when cancelling load custom mesh dialog #1530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions material_maker/panels/preview_3d/model_menu.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func update_model_selector() -> void:
for i in min(custom_models.size(), MAX_CUSTOM_MODELS):
Model.add_item(custom_models[i].get_file(), i+objects_count)

func _on_model_item_selected(index: int, custom_model_path : String = "") -> void:
func _on_model_item_selected(index : int, custom_model_path : String = "") -> void:
var objects_count : int = preview3D.objects.get_child_count()
if index >= objects_count:
custom_model_path = custom_models[index-objects_count]
Expand All @@ -77,8 +77,13 @@ func _on_model_item_selected(index: int, custom_model_path : String = "") -> voi

# Return to the previous model, if the selection failed (can happen on custom models)
elif mm_globals.has_config(SETTING_3D_PREVIEW_MODEL):
Model.select(mm_globals.get_config(SETTING_3D_PREVIEW_MODEL))
_on_model_item_selected(mm_globals.get_config(SETTING_3D_PREVIEW_MODEL))
var config_index : int = mm_globals.get_config(SETTING_3D_PREVIEW_MODEL)
if index != config_index:
Model.select(config_index)
_on_model_item_selected(config_index)
else:
Model.select(0)
_on_model_item_selected(0)
else:
Model.select(0)
_on_model_item_selected(0)
Expand Down