diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:41:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:42:52 +0300 |
| commit | 253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch) | |
| tree | e4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/makesdna/DNA_ID.h | |
| parent | fe52a05e950e474036c80f554a4675f12203695b (diff) | |
| parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index d7dfa70adad..4e5f76a6b72 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -294,9 +294,9 @@ enum ePreviewImage_Flag { /* for PreviewImage->tag */ enum { - PRV_TAG_DEFFERED = (1 << 0), /* Actual loading of preview is deffered. */ - PRV_TAG_DEFFERED_RENDERING = (1 << 1), /* Deffered preview is being loaded. */ - PRV_TAG_DEFFERED_DELETE = (1 << 2), /* Deffered preview should be deleted asap. */ + PRV_TAG_DEFFERED = (1 << 0), /* Actual loading of preview is deferred. */ + PRV_TAG_DEFFERED_RENDERING = (1 << 1), /* Deferred preview is being loaded. */ + PRV_TAG_DEFFERED_DELETE = (1 << 2), /* Deferred preview should be deleted asap. */ }; typedef struct PreviewImage { |