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/intern/displist.c | |
| 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/intern/displist.c')
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index b47b404dfe0..97923d23fb1 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1132,10 +1132,12 @@ static void curve_calc_orcodm(Scene *scene, Object *ob, DerivedMesh *derivedFina int required_mode; int editmode = (!forRender && (cu->editnurb || cu->editfont)); DerivedMesh *ndm, *orcodm = NULL; - const ModifierApplyFlag app_flag = renderResolution ? MOD_APPLY_RENDER : 0; + ModifierApplyFlag app_flag = MOD_APPLY_ORCO; - if (renderResolution) + if (renderResolution) { + app_flag |= MOD_APPLY_RENDER; required_mode = eModifierMode_Render; + } else required_mode = eModifierMode_Realtime; |