diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-02 18:42:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-02 18:42:05 +0400 |
| commit | 4a4f091155e7fb1c7eba0988c815b41665e045b6 (patch) | |
| tree | 3e3f3ffb6b4935a13efd763f3d6de2e387c725f2 /source/blender/blenkernel/BKE_modifier.h | |
| parent | 4a8663d66e4d82b7a8b9a3f6155c6367b694e08c (diff) | |
Fix #35174: dynamic paint displacement missing in render.
A previous bugfix disabled the dynamic paint modifier for orco texture
coordinate evaluation of the modifier stack. However the MOD_APPLY_USECACHE
flag is not a good way to check if the modifier is evaluated for orcos.
Instead I've added a MOD_APPLY_ORCO flag. Also removed a bunch of
applyModifierEM callbacks, none of them served a purpose except for the
subsurf modifier.
Diffstat (limited to 'source/blender/blenkernel/BKE_modifier.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index cf79aaff55c..955df65d00d 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -111,7 +111,9 @@ typedef void (*TexWalkFunc)(void *userData, struct Object *ob, struct ModifierDa typedef enum ModifierApplyFlag { MOD_APPLY_RENDER = 1 << 0, /* Render time. */ - MOD_APPLY_USECACHE = 1 << 1, /* Final result. Is not set for temporary calculations like orco dms. */ + MOD_APPLY_USECACHE = 1 << 1, /* Result of evaluation will be cached, so modifier might + * want to cache data for quick updates (used by subsurf) */ + MOD_APPLY_ORCO = 1 << 2 /* Modifier evaluated for undeformed texture coordinates */ } ModifierApplyFlag; @@ -200,7 +202,8 @@ typedef struct ModifierTypeInfo { */ struct DerivedMesh *(*applyModifierEM)(struct ModifierData *md, struct Object *ob, struct BMEditMesh *editData, - struct DerivedMesh *derivedData); + struct DerivedMesh *derivedData, + ModifierApplyFlag flag); /********************* Optional functions *********************/ |