diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-12-08 11:34:37 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-12-08 11:34:37 +0400 |
| commit | 55416f435ab9043df13b23e3e5244003d05d69bf (patch) | |
| tree | 44b0b517178a5516a783171edc1730805c2e452c /source/blender/makesdna/DNA_ID.h | |
| parent | c005fb407bbb7aac4cf138fbba903bbb2c821c93 (diff) | |
Fix T37212: Wrong user counter when more than 32K users
Summary:
Was a limitation of short data type used for id->us.
Made it to be int, needed to reshuffle fields a bit
because of alignment.
Reviewers: campbellbarton, brecht
Reviewed By: brecht
Maniphest Tasks: T37212
Differential Revision: http://developer.blender.org/D76
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
| -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 1e145347bb3..af27ea921ce 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -111,12 +111,12 @@ typedef struct ID { struct ID *newid; struct Library *lib; char name[66]; /* MAX_ID_NAME */ - short pad, us; /** * LIB_... flags report on status of the datablock this ID belongs * to. */ short flag; + int us; int icon_id, pad2; IDProperty *properties; } ID; |