summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/sprite_frames.cpp2
-rw-r--r--scene/resources/tile_set.cpp5
-rw-r--r--scene/resources/tile_set.h1
3 files changed, 7 insertions, 1 deletions
diff --git a/scene/resources/sprite_frames.cpp b/scene/resources/sprite_frames.cpp
index 818be38681..17aaf579dd 100644
--- a/scene/resources/sprite_frames.cpp
+++ b/scene/resources/sprite_frames.cpp
@@ -201,6 +201,7 @@ void SpriteFrames::_set_animations(const Array &p_animations) {
anim.loop = d["loop"];
Array frames = d["frames"];
for (int j = 0; j < frames.size(); j++) {
+#ifndef DISABLE_DEPRECATED
// For compatibility.
Ref<Resource> res = frames[j];
if (res.is_valid()) {
@@ -208,6 +209,7 @@ void SpriteFrames::_set_animations(const Array &p_animations) {
anim.frames.push_back(frame);
continue;
}
+#endif
Dictionary f = frames[j];
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp
index d4b2be355e..efe04ce4e1 100644
--- a/scene/resources/tile_set.cpp
+++ b/scene/resources/tile_set.cpp
@@ -2527,6 +2527,11 @@ void TileSet::reset_state() {
while (!source_ids.is_empty()) {
remove_source(source_ids[0]);
}
+
+ tile_shape = TILE_SHAPE_SQUARE;
+ tile_layout = TILE_LAYOUT_STACKED;
+ tile_offset_axis = TILE_OFFSET_AXIS_HORIZONTAL;
+ tile_size = Size2i(16, 16);
}
const Vector2i TileSetSource::INVALID_ATLAS_COORDS = Vector2i(-1, -1);
diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h
index ad25629a1c..d62bac8570 100644
--- a/scene/resources/tile_set.h
+++ b/scene/resources/tile_set.h
@@ -308,7 +308,6 @@ private:
TileLayout tile_layout = TILE_LAYOUT_STACKED;
TileOffsetAxis tile_offset_axis = TILE_OFFSET_AXIS_HORIZONTAL;
Size2i tile_size = Size2i(16, 16); //Size2(64, 64);
- Vector2 tile_skew = Vector2(0, 0);
// Rendering.
bool uv_clipping = false;