Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Now ignore changes in MatMakerGDEditor is done with an int instad of a bool, so it won't matter if ignore is set multiple times. Also ignore changes in recreate, and don't allow multiple recreate()s to run.

Browse Source
This commit is contained in:
Relintai 2022-01-21 19:03:56 +01:00
parent 52a367239c
commit 23344760e7
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
game/addons/mat_maker_gd/editor/MatMakerGDEditor.gd
View File

@ -11,8 +11,8 @@ export(NodePath) var add_popup_path : NodePath = "Popups/AddPopup"
var _graph_edit : GraphEdit = null var _graph_edit : GraphEdit = null
var _material : MMMateial var _material : MMMateial
var _ignore_material_change_event : bool = false var _ignore_material_change_event : int = 0
var _event_recreate_queued : bool = false var _recreation_in_progress : bool = false
var _plugin : EditorPlugin = null var _plugin : EditorPlugin = null
var _undo_redo : UndoRedo = null var _undo_redo : UndoRedo = null
@ -58,6 +58,13 @@ func ensure_objs() -> void:
_graph_edit.connect("disconnection_request", self, "on_graph_edit_disconnection_request") _graph_edit.connect("disconnection_request", self, "on_graph_edit_disconnection_request")
func recreate() -> void: func recreate() -> void:
ignore_changes(true)
if _recreation_in_progress:
return
_recreation_in_progress = true
ensure_objs() ensure_objs()
_graph_edit.clear_connections() _graph_edit.clear_connections()
@ -94,7 +101,9 @@ func recreate() -> void:
_material.render() _material.render()
_event_recreate_queued = false _recreation_in_progress = false
ignore_changes(false)
func find_graph_node_for(nnode) -> Node: func find_graph_node_for(nnode) -> Node:
for c in _graph_edit.get_children(): for c in _graph_edit.get_children():
@ -119,16 +128,19 @@ func set_mmmaterial(object : MMMateial):
_material.connect("changed", self, "on_material_changed") _material.connect("changed", self, "on_material_changed")
func on_material_changed() -> void: func on_material_changed() -> void:
if _ignore_material_change_event: if _ignore_material_change_event > 0:
return return
if _event_recreate_queued: if _recreation_in_progress:
return return
call_deferred("recreate") call_deferred("recreate")
func ignore_changes(val : bool) -> void: func ignore_changes(val : bool) -> void:
_ignore_material_change_event = val if val:
_ignore_material_change_event += 1
else:
_ignore_material_change_event -= 1
func on_graph_edit_connection_request(from: String, from_slot: int, to: String, to_slot: int): func on_graph_edit_connection_request(from: String, from_slot: int, to: String, to_slot: int):
var from_node : GraphNode = _graph_edit.get_node(from) var from_node : GraphNode = _graph_edit.get_node(from)