Browse Source

Merge pull request #67580 from KoBeWi/little_things

Minor code improvements
Rémi Verschelde 2 years ago
parent
commit
d0fbeec66a

+ 1 - 1
core/object/object.h

@@ -133,7 +133,7 @@ enum PropertyUsageFlags {
 	PROPERTY_USAGE_ARRAY = 1 << 29, // Used in the inspector to group properties as elements of an array.
 
 	PROPERTY_USAGE_DEFAULT = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR,
-	PROPERTY_USAGE_DEFAULT_INTL = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_INTERNATIONALIZED,
+	PROPERTY_USAGE_DEFAULT_INTL = PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNATIONALIZED,
 	PROPERTY_USAGE_NO_EDITOR = PROPERTY_USAGE_STORAGE,
 };
 

+ 0 - 6
editor/plugins/tiles/tile_set_editor.cpp

@@ -808,9 +808,3 @@ TileSetEditor::TileSetEditor() {
 	EditorNode::get_singleton()->get_editor_data().add_move_array_element_function(SNAME("TileSet"), callable_mp(this, &TileSetEditor::_move_tile_set_array_element));
 	EditorNode::get_singleton()->get_editor_data().add_undo_redo_inspector_hook_callback(callable_mp(this, &TileSetEditor::_undo_redo_inspector_callback));
 }
-
-TileSetEditor::~TileSetEditor() {
-	if (tile_set.is_valid()) {
-		tile_set->disconnect("changed", callable_mp(this, &TileSetEditor::_tile_set_changed));
-	}
-}

+ 0 - 1
editor/plugins/tiles/tile_set_editor.h

@@ -109,7 +109,6 @@ public:
 	void edit(Ref<TileSet> p_tile_set);
 
 	TileSetEditor();
-	~TileSetEditor();
 };
 
 #endif // TILE_SET_EDITOR_H

+ 0 - 4
scene/2d/tile_map.cpp

@@ -4056,9 +4056,5 @@ TileMap::TileMap() {
 }
 
 TileMap::~TileMap() {
-	if (tile_set.is_valid()) {
-		tile_set->disconnect("changed", callable_mp(this, &TileMap::_tile_set_changed));
-	}
-
 	_clear_internals();
 }