diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-04-04 15:42:33 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-04-04 16:49:30 +0300 |
commit | 59f6371a85824b4785db8e2b526c1101a5e30ca7 (patch) | |
tree | f8e512d18b21ed8b58e0dc111e8e807e1bb01c4f /source/blender/blenkernel/BKE_modifier.h | |
parent | c81eca3d986115ae8f3c542e9b00b89795233864 (diff) |
Fix T63252: Bind in Mesh Deform Modifier fails
A regression since 64c8d72ef1ad.
The solution is to force modifier evaluation for an evaluated
object, and let it to copy binding data back to original when
is being evaluated for binding.
Reviewers: brecht
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D4642
Diffstat (limited to 'source/blender/blenkernel/BKE_modifier.h')
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index a375ed3044c..9f522c11733 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -403,6 +403,16 @@ void modifier_path_init(char *path, int path_maxlen, const char *name); const char *modifier_path_relbase(struct Main *bmain, struct Object *ob); const char *modifier_path_relbase_from_global(struct Object *ob); +/* Accessors of original/evaluated modifiers. */ + +/* For a given modifier data, get corresponding original one. + * If the modifier data is already original, return it as-is. */ +struct ModifierData *modifier_get_original(struct ModifierData *md); +struct ModifierData *modifier_get_evaluated( + struct Depsgraph* depsgraph, + struct Object *object, + struct ModifierData *md); + /* wrappers for modifier callbacks that ensure valid normals */ struct Mesh *modwrap_applyModifier( |