diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-26 01:31:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-26 01:31:19 +0400 |
| commit | 2cd5436a81da5c15ac70bd2b80c2f062cce5d02e (patch) | |
| tree | 2cc12476fb3fa653042eef99fa6b5d4d8cb290ec /source/blender/blenkernel/depsgraph_private.h | |
| parent | 4ced91da47ec1e95d71beef07b218fd0290ff68a (diff) | |
| parent | 02d72b5c076f4ae1b47da74fe7a60a916edad9f2 (diff) | |
svn merge ^/trunk/blender -r42839:42871
Diffstat (limited to 'source/blender/blenkernel/depsgraph_private.h')
| -rw-r--r-- | source/blender/blenkernel/depsgraph_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/depsgraph_private.h b/source/blender/blenkernel/depsgraph_private.h index 2dd14281253..0338d10a66d 100644 --- a/source/blender/blenkernel/depsgraph_private.h +++ b/source/blender/blenkernel/depsgraph_private.h @@ -69,7 +69,7 @@ typedef struct DagNode int ancestor_count; unsigned int lay; // accumulated layers of its relations + itself unsigned int scelay; // layers due to being in scene - unsigned int customdata_mask; // customdata mask + uint64_t customdata_mask; // customdata mask int lasttime; // if lasttime != DagForest->time, this node was not evaluated yet for flushing int BFS_dist; // BFS distance int DFS_dist; // DFS distance |