mirror of
https://github.com/aseprite/aseprite.git
synced 2024-10-02 21:12:10 +00:00
Fix incorrect diff between layers debugging the restoration of a backup (TEST_BACKUP_INTEGRITY)
Only in debug mode with TEST_BACKUP_INTEGRITY flag, we now don't detect as a layer diff between the doc in memory and the restore doc from backup if only some layer flags like visibility/collapse changed.
This commit is contained in:
parent
3ea0437e1d
commit
2596d44732
@ -1,5 +1,5 @@
|
|||||||
// Aseprite
|
// Aseprite
|
||||||
// Copyright (C) 2019-2023 Igara Studio S.A.
|
// Copyright (C) 2019-2024 Igara Studio S.A.
|
||||||
// Copyright (C) 2018 David Capello
|
// Copyright (C) 2018 David Capello
|
||||||
//
|
//
|
||||||
// This program is distributed under the terms of
|
// This program is distributed under the terms of
|
||||||
@ -191,8 +191,8 @@ DocDiff compare_docs(const Doc* a,
|
|||||||
if (aLay->type() != bLay->type() ||
|
if (aLay->type() != bLay->type() ||
|
||||||
aLay->name() != bLay->name() ||
|
aLay->name() != bLay->name() ||
|
||||||
aLay->userData() != bLay->userData() ||
|
aLay->userData() != bLay->userData() ||
|
||||||
((int(aLay->flags()) & int(LayerFlags::PersistentFlagsMask)) !=
|
((int(aLay->flags()) & int(LayerFlags::StructuralFlagsMask)) !=
|
||||||
(int(bLay->flags()) & int(LayerFlags::PersistentFlagsMask))) ||
|
(int(bLay->flags()) & int(LayerFlags::StructuralFlagsMask))) ||
|
||||||
(aLay->isImage() && bLay->isImage() &&
|
(aLay->isImage() && bLay->isImage() &&
|
||||||
(((const LayerImage*)aLay)->opacity() != ((const LayerImage*)bLay)->opacity())) ||
|
(((const LayerImage*)aLay)->opacity() != ((const LayerImage*)bLay)->opacity())) ||
|
||||||
(aLay->isTilemap() && bLay->isTilemap() &&
|
(aLay->isTilemap() && bLay->isTilemap() &&
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// Aseprite Document Library
|
// Aseprite Document Library
|
||||||
// Copyright (C) 2019-2021 Igara Studio S.A.
|
// Copyright (C) 2019-2024 Igara Studio S.A.
|
||||||
// Copyright (C) 2001-2018 David Capello
|
// Copyright (C) 2001-2018 David Capello
|
||||||
//
|
//
|
||||||
// This file is released under the terms of the MIT license.
|
// This file is released under the terms of the MIT license.
|
||||||
@ -42,10 +42,13 @@ namespace doc {
|
|||||||
Reference = 64, // Is a reference layer
|
Reference = 64, // Is a reference layer
|
||||||
|
|
||||||
PersistentFlagsMask = 0xffff,
|
PersistentFlagsMask = 0xffff,
|
||||||
|
|
||||||
Internal_WasVisible = 0x10000, // Was visible in the alternative state (Alt+click)
|
Internal_WasVisible = 0x10000, // Was visible in the alternative state (Alt+click)
|
||||||
|
|
||||||
BackgroundLayerFlags = LockMove | Background,
|
BackgroundLayerFlags = LockMove | Background,
|
||||||
|
|
||||||
|
// Flags that change the modified flag of the document
|
||||||
|
// (e.g. created by undoable actions).
|
||||||
|
StructuralFlagsMask = Background | Reference,
|
||||||
};
|
};
|
||||||
|
|
||||||
class Layer : public WithUserData {
|
class Layer : public WithUserData {
|
||||||
|
Loading…
Reference in New Issue
Block a user