diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-18 18:04:06 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-18 18:04:06 +0300 |
| commit | 1fb43dcd5a7549f98a96faa41110ca22877003e5 (patch) | |
| tree | 9e93aa089233d61eff3fa96d476592d0a3b7fa34 /source/blender/makesdna/DNA_ID.h | |
| parent | 5566a8887343f69b565e74f98fc5e7874031b648 (diff) | |
Fix bad merge happened at some point
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index a2f64627787..0b8778674b3 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -459,9 +459,7 @@ enum { enum { /* RESET_AFTER_USE, used by update code (depsgraph). */ ID_RECALC = 1 << 0, - ID_RECALC_DATA = 1 << 1, - ID_RECALC_SKIP_ANIM_TAG = 1 << 2, - ID_RECALC_ALL = (ID_RECALC | ID_RECALC_DATA), + ID_RECALC_ALL = ID_RECALC, }; /* To filter ID types (filter_id) */ |