diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-26 20:25:21 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-26 20:25:21 +0400 |
commit | 47cd3d4b8e5d8a0b7c30475a2b7944c70423eba2 (patch) | |
tree | 73666f60c341e3449a4a451146df64a8d72c0dee /source/blender/blenkernel/BKE_modifier.h | |
parent | 03336c0ba782a1608c635226c545b57ebbcb67e3 (diff) |
Fix for truncation of 64-bit CustomDataMasks.
Can't use GET_INT_FROM_POINTER anymore with CD masks, as this
truncates to 32-bit.
Bug: http://projects.blender.org/tracker/index.php?func=detail&aid=30680&group_id=9&atid=498
CR: http://codereview.appspot.com/5905059/
Diffstat (limited to 'source/blender/blenkernel/BKE_modifier.h')
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index b73982ca852..b4320b7025a 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -357,16 +357,21 @@ int modifiers_isPreview(struct Object *ob); int modifiers_indexInObject(struct Object *ob, struct ModifierData *md); +typedef struct CDMaskLink { + struct CDMaskLink *next; + CustomDataMask mask; +} CDMaskLink; + /* Calculates and returns a linked list of CustomDataMasks indicating the * data required by each modifier in the stack pointed to by md for correct * evaluation, assuming the data indicated by dataMask is required at the * end of the stack. */ -struct LinkNode *modifiers_calcDataMasks(struct Scene *scene, - struct Object *ob, - struct ModifierData *md, - CustomDataMask dataMask, - int required_mode); +struct CDMaskLink *modifiers_calcDataMasks(struct Scene *scene, + struct Object *ob, + struct ModifierData *md, + CustomDataMask dataMask, + int required_mode); struct ModifierData *modifiers_getLastPreview(struct Scene *scene, struct ModifierData *md, int required_mode); |