diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-22 07:10:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-22 07:10:43 +0300 |
| commit | 648df0fcdb8249d8d00ee501d6947216bb7330d5 (patch) | |
| tree | 4356a8ac020cea06bf13a695e0b4309acaab448a /source/blender/makesdna/DNA_ID.h | |
| parent | 257cf86a05517fd66d65f55c95fc28ec945804a8 (diff) | |
Revert "BKE: Changing ID freeing order."
This reverts commit 87c72a7d2714de286109573055d5d5da32ece91e.
Caused T54121 which breaks blend file saving.
For now crash on exit is preferable.
Possible solution is to free screen-manipulator batches in a separate
loop.
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index ffa09a21944..fd8cd8b2855 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -519,8 +519,6 @@ enum { * keep them in sync! */ enum { INDEX_ID_LI = 0, - INDEX_ID_WS, - INDEX_ID_WM, INDEX_ID_IP, INDEX_ID_AC, INDEX_ID_KE, @@ -553,6 +551,8 @@ enum { INDEX_ID_OB, INDEX_ID_LS, INDEX_ID_SCE, + INDEX_ID_WS, + INDEX_ID_WM, INDEX_ID_MSK, INDEX_ID_NULL, }; |