diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-04 16:11:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-04 16:17:16 +0300 |
| commit | 07f004620397fd818d2684d08ff67422d76a92cf (patch) | |
| tree | 5a0db889de90d702a3b6814ede41f497faddfdda /source/blender/makesdna/DNA_ID.h | |
| parent | 1dc31f5b982559bbe875d469950ee7404e9a4a3c (diff) | |
Fix crash when making objects to share same mesh
Make it more reliable and predictable way of getting pointer to
an original mesh which came from copy-on-write engine.
Related change: made it (hopefully) more clear name for flags.
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 05e39c6636a..6ce0c94d884 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -467,8 +467,8 @@ enum { LIB_TAG_PRE_EXISTING = 1 << 11, /* The datablock is a copy-on-write/localized version. */ - LIB_TAG_COPY_ON_WRITE = 1 << 12, - LIB_TAG_COPY_ON_WRITE_EVAL = 1 << 13, + LIB_TAG_COPIED_ON_WRITE = 1 << 12, + LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT = 1 << 13, LIB_TAG_LOCALIZED = 1 << 14, /* RESET_NEVER tag datablock for freeing etc. behavior (usually set when copying real one into temp/runtime one). */ |