Skip to content

Commit 3a3e109

Browse files
Hopefully fixing the project-breaking bug (#381)
* Fixed Dependecies I moved some scenes in the last minute. Stupid me. I hope it is fixed now. * Revert "Fixed Dependecies" This reverts commit 9e7bcd8. * Auto stash before merge of "main" and "upstream/main" * Update Changelog To contain the changes I made during the last week. * Revert "Auto stash before merge of "main" and "upstream/main"" This reverts commit 8e1699d. * Add the new styles to the remaining pickers TimelinePicker, ThemePicker, OperationPicker, GlossaryPicker. It also removes the [] around the items, except for the operation picker. I wasn't sure if it wouldn't make readability harder having three similar buttons next to each other, so I kept the [] there. And it adds a "Bus:" label to the AudioPicker, because I thought it would make it cleaner. * Cleanup and Simplification of the MasterTree.gd * Auto stash before merge of "main" and "upstream/main" * Removing the regression These lines just made such a mess. I'm not even sure why. But it works WAY better without them.
1 parent da9b132 commit 3a3e109

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -507,15 +507,12 @@ func cancel_drop_event():
507507

508508
# Adding an event to the timeline
509509
func create_event(scene: String, data: Dictionary = {'no-data': true} , indent: bool = false):
510-
var key = "res://addons/dialogic/Editor/Events/" + scene + ".tscn"
511-
var event_scene = event_scenes.get(key)
512-
if event_scene == null:
513-
event_scenes[key] = load(key)
514-
var piece = event_scenes[key].instance(PackedScene.GEN_EDIT_STATE_INSTANCE)
510+
var piece = load("res://addons/dialogic/Editor/Events/" + scene + ".tscn").instance()
515511
piece.editor_reference = editor_reference
512+
516513
if data.has('no-data') == false:
517-
#piece.load_data(data)
518514
piece.event_data = data
515+
519516
if len(selected_items) != 0:
520517
timeline.add_child_below_node(selected_items[0], piece)
521518
else:

0 commit comments

Comments
 (0)