diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 22:09:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 22:09:10 +0300 |
| commit | cf8add42b807449e6f96f8ecab637d52e166052f (patch) | |
| tree | c6fe3713ea8a1b85eb986dcfb08546772166202e /source/blender/makesdna | |
| parent | e673c9dc938844d158abe543457aca8016ef8bc1 (diff) | |
| parent | a4bbce894914837c65f06f466f40e0cc1db7acb9 (diff) | |
Merge branch 'master' into blender2.8
Stupid git handles merges terribly when there are conflicts and branch
is modified buring merge process... :((((
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 63752142b84..4b628c4bc70 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -365,7 +365,7 @@ enum { LIB_TAG_ID_RECALC_ALL = (LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA), /* The datablock is a copy-on-write version. */ - LIB_TAG_COPY_ON_WRITE = (1 << 15), + LIB_TAG_COPY_ON_WRITE = 1 << 15, /* RESET_NEVER tag datablock for freeing etc. behavior (usually set when copying real one into temp/runtime one). */ LIB_TAG_NO_MAIN = 1 << 16, /* Datablock is not listed in Main database. */ |