Skip to content

Commit fb03c9c

Browse files
RepiteoRepiteo
committed
Merge pull request #112739 from FantasmaGolicon/master
Change `TileSetScenesCollectionSource` raw pointers in the TileSet editor to ref
2 parents 8a04e33 + ea1cc3c commit fb03c9c

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ bool TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::_s
7676
}
7777

7878
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()) {
8080
return false;
8181
}
8282
String name = p_name;
@@ -114,7 +114,7 @@ void TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::ed
114114
}
115115

116116
// Disconnect to changes.
117-
if (tile_set_scenes_collection_source) {
117+
if (tile_set_scenes_collection_source.is_valid()) {
118118
tile_set_scenes_collection_source->disconnect(CoreStringName(property_list_changed), callable_mp((Object *)this, &Object::notify_property_list_changed));
119119
}
120120

@@ -123,7 +123,7 @@ void TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::ed
123123
source_id = p_source_id;
124124

125125
// Connect to changes.
126-
if (tile_set_scenes_collection_source) {
126+
if (tile_set_scenes_collection_source.is_valid()) {
127127
if (!tile_set_scenes_collection_source->is_connected(CoreStringName(property_list_changed), callable_mp((Object *)this, &Object::notify_property_list_changed))) {
128128
tile_set_scenes_collection_source->connect(CoreStringName(property_list_changed), callable_mp((Object *)this, &Object::notify_property_list_changed));
129129
}
@@ -134,7 +134,7 @@ void TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::ed
134134

135135
// -- Proxy object used by the tile inspector --
136136
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()) {
138138
return false;
139139
}
140140

@@ -166,7 +166,7 @@ bool TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_set(const Strin
166166
}
167167

168168
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()) {
170170
return false;
171171
}
172172

@@ -185,7 +185,7 @@ bool TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_get(const Strin
185185
}
186186

187187
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()) {
189189
return;
190190
}
191191

@@ -255,8 +255,8 @@ void TileSetScenesCollectionSourceEditor::_scene_file_selected(const String &p_p
255255
int scene_id = tile_set_scenes_collection_source->get_next_scene_tile_id();
256256
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
257257
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);
260260
undo_redo->commit_action();
261261
_update_scenes_list();
262262
_update_action_buttons();
@@ -270,8 +270,8 @@ void TileSetScenesCollectionSourceEditor::_source_delete_pressed() {
270270

271271
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
272272
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);
275275
undo_redo->commit_action();
276276
_update_scenes_list();
277277
_update_action_buttons();
@@ -280,7 +280,7 @@ void TileSetScenesCollectionSourceEditor::_source_delete_pressed() {
280280

281281
void TileSetScenesCollectionSourceEditor::_update_source_inspector() {
282282
// 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);
284284
}
285285

286286
void TileSetScenesCollectionSourceEditor::_update_tile_inspector() {
@@ -290,7 +290,7 @@ void TileSetScenesCollectionSourceEditor::_update_tile_inspector() {
290290
// Update the proxy object.
291291
if (has_atlas_tile_selected) {
292292
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);
294294
}
295295

296296
// Update visibility.
@@ -304,7 +304,7 @@ void TileSetScenesCollectionSourceEditor::_update_action_buttons() {
304304
}
305305

306306
void TileSetScenesCollectionSourceEditor::_update_scenes_list() {
307-
if (!tile_set_scenes_collection_source) {
307+
if (tile_set_scenes_collection_source.is_null()) {
308308
return;
309309
}
310310

@@ -405,12 +405,12 @@ void TileSetScenesCollectionSourceEditor::edit(Ref<TileSet> p_tile_set, TileSetS
405405
new_read_only_state = EditorNode::get_singleton()->is_resource_read_only(p_tile_set);
406406
}
407407

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) {
409409
return;
410410
}
411411

412412
// Remove listener for old objects.
413-
if (tile_set_scenes_collection_source) {
413+
if (tile_set_scenes_collection_source.is_valid()) {
414414
tile_set_scenes_collection_source->disconnect_changed(callable_mp(this, &TileSetScenesCollectionSourceEditor::_tile_set_scenes_collection_source_changed));
415415
}
416416

@@ -430,7 +430,7 @@ void TileSetScenesCollectionSourceEditor::edit(Ref<TileSet> p_tile_set, TileSetS
430430
}
431431

432432
// Add the listener again.
433-
if (tile_set_scenes_collection_source) {
433+
if (tile_set_scenes_collection_source.is_valid()) {
434434
tile_set_scenes_collection_source->connect_changed(callable_mp(this, &TileSetScenesCollectionSourceEditor::_tile_set_scenes_collection_source_changed));
435435
}
436436

@@ -456,8 +456,8 @@ void TileSetScenesCollectionSourceEditor::_drop_data_fw(const Point2 &p_point, c
456456
int scene_id = tile_set_scenes_collection_source->get_next_scene_tile_id();
457457
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
458458
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);
461461
undo_redo->commit_action();
462462
}
463463
}

‎editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TileSetScenesCollectionSourceEditor : public HBoxContainer {
4949

5050
private:
5151
Ref<TileSet> tile_set;
52-
TileSetScenesCollectionSource *tile_set_scenes_collection_source = nullptr;
52+
Ref<TileSetScenesCollectionSource> tile_set_scenes_collection_source;
5353
int source_id = -1;
5454

5555
protected:
@@ -72,7 +72,7 @@ class TileSetScenesCollectionSourceEditor : public HBoxContainer {
7272
private:
7373
TileSetScenesCollectionSourceEditor *tile_set_scenes_collection_source_editor = nullptr;
7474

75-
TileSetScenesCollectionSource *tile_set_scenes_collection_source = nullptr;
75+
Ref<TileSetScenesCollectionSource> tile_set_scenes_collection_source;
7676
int source_id;
7777
int scene_id;
7878

@@ -96,7 +96,7 @@ class TileSetScenesCollectionSourceEditor : public HBoxContainer {
9696
bool read_only = false;
9797

9898
Ref<TileSet> tile_set;
99-
TileSetScenesCollectionSource *tile_set_scenes_collection_source = nullptr;
99+
Ref<TileSetScenesCollectionSource> tile_set_scenes_collection_source;
100100
int tile_set_source_id = -1;
101101

102102
bool tile_set_scenes_collection_source_changed_needs_update = false;

0 commit comments

Comments
 (0)