Changed TileSetScenesCollectionSource raw pointers in the TileSet editor to Ref<TileSetScenesCollectionSource>

FantasmaGolicon · FantasmaGolicon · commit ea1cc3c04ee0 · 2025-11-14T15:22:11.000-08:00
diff --git a/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp
@@ -76,7 +76,7 @@ bool TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::_s
 }
 
 bool TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::_get(const StringName &p_name, Variant &r_ret) const {
-	if (!tile_set_scenes_collection_source) {
+	if (tile_set_scenes_collection_source.is_null()) {
 		return false;
 	}
 	String name = p_name;
@@ -114,7 +114,7 @@ void TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::ed
 	}
 
 	// Disconnect to changes.
-	if (tile_set_scenes_collection_source) {
+	if (tile_set_scenes_collection_source.is_valid()) {
 		tile_set_scenes_collection_source->disconnect(CoreStringName(property_list_changed), callable_mp((Object *)this, &Object::notify_property_list_changed));
 	}
 
@@ -123,7 +123,7 @@ void TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::ed
 	source_id = p_source_id;
 
 	// Connect to changes.
-	if (tile_set_scenes_collection_source) {
+	if (tile_set_scenes_collection_source.is_valid()) {
 		if (!tile_set_scenes_collection_source->is_connected(CoreStringName(property_list_changed), callable_mp((Object *)this, &Object::notify_property_list_changed))) {
 			tile_set_scenes_collection_source->connect(CoreStringName(property_list_changed), callable_mp((Object *)this, &Object::notify_property_list_changed));
 		}
@@ -134,7 +134,7 @@ void TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::ed
 
 // -- Proxy object used by the tile inspector --
 bool TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_set(const StringName &p_name, const Variant &p_value) {
-	if (!tile_set_scenes_collection_source) {
+	if (tile_set_scenes_collection_source.is_null()) {
 		return false;
 	}
 
@@ -166,7 +166,7 @@ bool TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_set(const Strin
 }
 
 bool TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_get(const StringName &p_name, Variant &r_ret) const {
-	if (!tile_set_scenes_collection_source) {
+	if (tile_set_scenes_collection_source.is_null()) {
 		return false;
 	}
 
@@ -185,7 +185,7 @@ bool TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_get(const Strin
 }
 
 void TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_get_property_list(List<PropertyInfo> *p_list) const {
-	if (!tile_set_scenes_collection_source) {
+	if (tile_set_scenes_collection_source.is_null()) {
 		return;
 	}
 
@@ -255,8 +255,8 @@ void TileSetScenesCollectionSourceEditor::_scene_file_selected(const String &p_p
 	int scene_id = tile_set_scenes_collection_source->get_next_scene_tile_id();
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Add a Scene Tile"));
-	undo_redo->add_do_method(tile_set_scenes_collection_source, "create_scene_tile", scene, scene_id);
-	undo_redo->add_undo_method(tile_set_scenes_collection_source, "remove_scene_tile", scene_id);
+	undo_redo->add_do_method(*tile_set_scenes_collection_source, "create_scene_tile", scene, scene_id);
+	undo_redo->add_undo_method(*tile_set_scenes_collection_source, "remove_scene_tile", scene_id);
 	undo_redo->commit_action();
 	_update_scenes_list();
 	_update_action_buttons();
@@ -270,8 +270,8 @@ void TileSetScenesCollectionSourceEditor::_source_delete_pressed() {
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Remove a Scene Tile"));
-	undo_redo->add_do_method(tile_set_scenes_collection_source, "remove_scene_tile", scene_id);
-	undo_redo->add_undo_method(tile_set_scenes_collection_source, "create_scene_tile", tile_set_scenes_collection_source->get_scene_tile_scene(scene_id), scene_id);
+	undo_redo->add_do_method(*tile_set_scenes_collection_source, "remove_scene_tile", scene_id);
+	undo_redo->add_undo_method(*tile_set_scenes_collection_source, "create_scene_tile", tile_set_scenes_collection_source->get_scene_tile_scene(scene_id), scene_id);
 	undo_redo->commit_action();
 	_update_scenes_list();
 	_update_action_buttons();
@@ -280,7 +280,7 @@ void TileSetScenesCollectionSourceEditor::_source_delete_pressed() {
 
 void TileSetScenesCollectionSourceEditor::_update_source_inspector() {
 	// Update the proxy object.
-	scenes_collection_source_proxy_object->edit(tile_set, tile_set_scenes_collection_source, tile_set_source_id);
+	scenes_collection_source_proxy_object->edit(tile_set, *tile_set_scenes_collection_source, tile_set_source_id);
 }
 
 void TileSetScenesCollectionSourceEditor::_update_tile_inspector() {
@@ -290,7 +290,7 @@ void TileSetScenesCollectionSourceEditor::_update_tile_inspector() {
 	// Update the proxy object.
 	if (has_atlas_tile_selected) {
 		int scene_id = scene_tiles_list->get_item_metadata(selected_indices[0]);
-		tile_proxy_object->edit(tile_set_scenes_collection_source, scene_id);
+		tile_proxy_object->edit(*tile_set_scenes_collection_source, scene_id);
 	}
 
 	// Update visibility.
@@ -304,7 +304,7 @@ void TileSetScenesCollectionSourceEditor::_update_action_buttons() {
 }
 
 void TileSetScenesCollectionSourceEditor::_update_scenes_list() {
-	if (!tile_set_scenes_collection_source) {
+	if (tile_set_scenes_collection_source.is_null()) {
 		return;
 	}
 
@@ -405,12 +405,12 @@ void TileSetScenesCollectionSourceEditor::edit(Ref<TileSet> p_tile_set, TileSetS
 		new_read_only_state = EditorNode::get_singleton()->is_resource_read_only(p_tile_set);
 	}
 
-	if (p_tile_set == tile_set && p_tile_set_scenes_collection_source == tile_set_scenes_collection_source && p_source_id == tile_set_source_id && new_read_only_state == read_only) {
+	if (p_tile_set == tile_set && p_tile_set_scenes_collection_source == *tile_set_scenes_collection_source && p_source_id == tile_set_source_id && new_read_only_state == read_only) {
 		return;
 	}
 
 	// Remove listener for old objects.
-	if (tile_set_scenes_collection_source) {
+	if (tile_set_scenes_collection_source.is_valid()) {
 		tile_set_scenes_collection_source->disconnect_changed(callable_mp(this, &TileSetScenesCollectionSourceEditor::_tile_set_scenes_collection_source_changed));
 	}
 
@@ -430,7 +430,7 @@ void TileSetScenesCollectionSourceEditor::edit(Ref<TileSet> p_tile_set, TileSetS
 	}
 
 	// Add the listener again.
-	if (tile_set_scenes_collection_source) {
+	if (tile_set_scenes_collection_source.is_valid()) {
 		tile_set_scenes_collection_source->connect_changed(callable_mp(this, &TileSetScenesCollectionSourceEditor::_tile_set_scenes_collection_source_changed));
 	}
 
@@ -456,8 +456,8 @@ void TileSetScenesCollectionSourceEditor::_drop_data_fw(const Point2 &p_point, c
 				int scene_id = tile_set_scenes_collection_source->get_next_scene_tile_id();
 				EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 				undo_redo->create_action(TTR("Add a Scene Tile"));
-				undo_redo->add_do_method(tile_set_scenes_collection_source, "create_scene_tile", resource, scene_id);
-				undo_redo->add_undo_method(tile_set_scenes_collection_source, "remove_scene_tile", scene_id);
+				undo_redo->add_do_method(*tile_set_scenes_collection_source, "create_scene_tile", resource, scene_id);
+				undo_redo->add_undo_method(*tile_set_scenes_collection_source, "remove_scene_tile", scene_id);
 				undo_redo->commit_action();
 			}
 		}
diff --git a/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h
@@ -49,7 +49,7 @@ class TileSetScenesCollectionSourceEditor : public HBoxContainer {
 
 	private:
 		Ref<TileSet> tile_set;
-		TileSetScenesCollectionSource *tile_set_scenes_collection_source = nullptr;
+		Ref<TileSetScenesCollectionSource> tile_set_scenes_collection_source;
 		int source_id = -1;
 
 	protected:
@@ -72,7 +72,7 @@ class TileSetScenesCollectionSourceEditor : public HBoxContainer {
 	private:
 		TileSetScenesCollectionSourceEditor *tile_set_scenes_collection_source_editor = nullptr;
 
-		TileSetScenesCollectionSource *tile_set_scenes_collection_source = nullptr;
+		Ref<TileSetScenesCollectionSource> tile_set_scenes_collection_source;
 		int source_id;
 		int scene_id;
 
@@ -96,7 +96,7 @@ class TileSetScenesCollectionSourceEditor : public HBoxContainer {
 	bool read_only = false;
 
 	Ref<TileSet> tile_set;
-	TileSetScenesCollectionSource *tile_set_scenes_collection_source = nullptr;
+	Ref<TileSetScenesCollectionSource> tile_set_scenes_collection_source;
 	int tile_set_source_id = -1;
 
 	bool tile_set_scenes_collection_source_changed_needs_update = false;

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ bool TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::_s`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`bool TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::_get(const StringName &p_name, Variant &r_ret) const {`
`79`		`- if (!tile_set_scenes_collection_source) {`
	`79`	`+ if (tile_set_scenes_collection_source.is_null()) {`
`80`	`80`	`return false;`
`81`	`81`	`}`
`82`	`82`	`String name = p_name;`
`@@ -114,7 +114,7 @@ void TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::ed`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`// Disconnect to changes.`
`117`		`- if (tile_set_scenes_collection_source) {`
	`117`	`+ if (tile_set_scenes_collection_source.is_valid()) {`
`118`	`118`	`tile_set_scenes_collection_source->disconnect(CoreStringName(property_list_changed), callable_mp((Object *)this, &Object::notify_property_list_changed));`
`119`	`119`	`}`
`120`	`120`
`@@ -123,7 +123,7 @@ void TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::ed`
`123`	`123`	`source_id = p_source_id;`
`124`	`124`
`125`	`125`	`// Connect to changes.`
`126`		`- if (tile_set_scenes_collection_source) {`
	`126`	`+ if (tile_set_scenes_collection_source.is_valid()) {`
`127`	`127`	`if (!tile_set_scenes_collection_source->is_connected(CoreStringName(property_list_changed), callable_mp((Object *)this, &Object::notify_property_list_changed))) {`
`128`	`128`	`tile_set_scenes_collection_source->connect(CoreStringName(property_list_changed), callable_mp((Object *)this, &Object::notify_property_list_changed));`
`129`	`129`	`}`
`@@ -134,7 +134,7 @@ void TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::ed`
`134`	`134`
`135`	`135`	`// -- Proxy object used by the tile inspector --`
`136`	`136`	`bool TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_set(const StringName &p_name, const Variant &p_value) {`
`137`		`- if (!tile_set_scenes_collection_source) {`
	`137`	`+ if (tile_set_scenes_collection_source.is_null()) {`
`138`	`138`	`return false;`
`139`	`139`	`}`
`140`	`140`
`@@ -166,7 +166,7 @@ bool TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_set(const Strin`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`bool TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_get(const StringName &p_name, Variant &r_ret) const {`
`169`		`- if (!tile_set_scenes_collection_source) {`
	`169`	`+ if (tile_set_scenes_collection_source.is_null()) {`
`170`	`170`	`return false;`
`171`	`171`	`}`
`172`	`172`
`@@ -185,7 +185,7 @@ bool TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_get(const Strin`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`void TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_get_property_list(List<PropertyInfo> *p_list) const {`
`188`		`- if (!tile_set_scenes_collection_source) {`
	`188`	`+ if (tile_set_scenes_collection_source.is_null()) {`
`189`	`189`	`return;`
`190`	`190`	`}`
`191`	`191`
`@@ -255,8 +255,8 @@ void TileSetScenesCollectionSourceEditor::_scene_file_selected(const String &p_p`
`255`	`255`	`int scene_id = tile_set_scenes_collection_source->get_next_scene_tile_id();`
`256`	`256`	`EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();`
`257`	`257`	`undo_redo->create_action(TTR("Add a Scene Tile"));`
`258`		`- undo_redo->add_do_method(tile_set_scenes_collection_source, "create_scene_tile", scene, scene_id);`
`259`		`- undo_redo->add_undo_method(tile_set_scenes_collection_source, "remove_scene_tile", scene_id);`
	`258`	`+ undo_redo->add_do_method(*tile_set_scenes_collection_source, "create_scene_tile", scene, scene_id);`
	`259`	`+ undo_redo->add_undo_method(*tile_set_scenes_collection_source, "remove_scene_tile", scene_id);`
`260`	`260`	`undo_redo->commit_action();`
`261`	`261`	`_update_scenes_list();`
`262`	`262`	`_update_action_buttons();`
`@@ -270,8 +270,8 @@ void TileSetScenesCollectionSourceEditor::_source_delete_pressed() {`
`270`	`270`
`271`	`271`	`EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();`
`272`	`272`	`undo_redo->create_action(TTR("Remove a Scene Tile"));`
`273`		`- undo_redo->add_do_method(tile_set_scenes_collection_source, "remove_scene_tile", scene_id);`
`274`		`- undo_redo->add_undo_method(tile_set_scenes_collection_source, "create_scene_tile", tile_set_scenes_collection_source->get_scene_tile_scene(scene_id), scene_id);`
	`273`	`+ undo_redo->add_do_method(*tile_set_scenes_collection_source, "remove_scene_tile", scene_id);`
	`274`	`+ undo_redo->add_undo_method(*tile_set_scenes_collection_source, "create_scene_tile", tile_set_scenes_collection_source->get_scene_tile_scene(scene_id), scene_id);`
`275`	`275`	`undo_redo->commit_action();`
`276`	`276`	`_update_scenes_list();`
`277`	`277`	`_update_action_buttons();`
`@@ -280,7 +280,7 @@ void TileSetScenesCollectionSourceEditor::_source_delete_pressed() {`
`280`	`280`
`281`	`281`	`void TileSetScenesCollectionSourceEditor::_update_source_inspector() {`
`282`	`282`	`// Update the proxy object.`
`283`		`- scenes_collection_source_proxy_object->edit(tile_set, tile_set_scenes_collection_source, tile_set_source_id);`
	`283`	`+ scenes_collection_source_proxy_object->edit(tile_set, *tile_set_scenes_collection_source, tile_set_source_id);`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`void TileSetScenesCollectionSourceEditor::_update_tile_inspector() {`
`@@ -290,7 +290,7 @@ void TileSetScenesCollectionSourceEditor::_update_tile_inspector() {`
`290`	`290`	`// Update the proxy object.`
`291`	`291`	`if (has_atlas_tile_selected) {`
`292`	`292`	`int scene_id = scene_tiles_list->get_item_metadata(selected_indices[0]);`
`293`		`- tile_proxy_object->edit(tile_set_scenes_collection_source, scene_id);`
	`293`	`+ tile_proxy_object->edit(*tile_set_scenes_collection_source, scene_id);`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`// Update visibility.`
`@@ -304,7 +304,7 @@ void TileSetScenesCollectionSourceEditor::_update_action_buttons() {`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`void TileSetScenesCollectionSourceEditor::_update_scenes_list() {`
`307`		`- if (!tile_set_scenes_collection_source) {`
	`307`	`+ if (tile_set_scenes_collection_source.is_null()) {`
`308`	`308`	`return;`
`309`	`309`	`}`
`310`	`310`
`@@ -405,12 +405,12 @@ void TileSetScenesCollectionSourceEditor::edit(Ref<TileSet> p_tile_set, TileSetS`
`405`	`405`	`new_read_only_state = EditorNode::get_singleton()->is_resource_read_only(p_tile_set);`
`406`	`406`	`}`
`407`	`407`
`408`		`- if (p_tile_set == tile_set && p_tile_set_scenes_collection_source == tile_set_scenes_collection_source && p_source_id == tile_set_source_id && new_read_only_state == read_only) {`
	`408`	`+ if (p_tile_set == tile_set && p_tile_set_scenes_collection_source == *tile_set_scenes_collection_source && p_source_id == tile_set_source_id && new_read_only_state == read_only) {`
`409`	`409`	`return;`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`// Remove listener for old objects.`
`413`		`- if (tile_set_scenes_collection_source) {`
	`413`	`+ if (tile_set_scenes_collection_source.is_valid()) {`
`414`	`414`	`tile_set_scenes_collection_source->disconnect_changed(callable_mp(this, &TileSetScenesCollectionSourceEditor::_tile_set_scenes_collection_source_changed));`
`415`	`415`	`}`
`416`	`416`
`@@ -430,7 +430,7 @@ void TileSetScenesCollectionSourceEditor::edit(Ref<TileSet> p_tile_set, TileSetS`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`// Add the listener again.`
`433`		`- if (tile_set_scenes_collection_source) {`
	`433`	`+ if (tile_set_scenes_collection_source.is_valid()) {`
`434`	`434`	`tile_set_scenes_collection_source->connect_changed(callable_mp(this, &TileSetScenesCollectionSourceEditor::_tile_set_scenes_collection_source_changed));`
`435`	`435`	`}`
`436`	`436`
`@@ -456,8 +456,8 @@ void TileSetScenesCollectionSourceEditor::_drop_data_fw(const Point2 &p_point, c`
`456`	`456`	`int scene_id = tile_set_scenes_collection_source->get_next_scene_tile_id();`
`457`	`457`	`EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();`
`458`	`458`	`undo_redo->create_action(TTR("Add a Scene Tile"));`
`459`		`- undo_redo->add_do_method(tile_set_scenes_collection_source, "create_scene_tile", resource, scene_id);`
`460`		`- undo_redo->add_undo_method(tile_set_scenes_collection_source, "remove_scene_tile", scene_id);`
	`459`	`+ undo_redo->add_do_method(*tile_set_scenes_collection_source, "create_scene_tile", resource, scene_id);`
	`460`	`+ undo_redo->add_undo_method(*tile_set_scenes_collection_source, "remove_scene_tile", scene_id);`
`461`	`461`	`undo_redo->commit_action();`
`462`	`462`	`}`
`463`	`463`	`}`