diff options
author | Ton Roosendaal <ton@blender.org> | 2007-11-16 18:46:59 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2007-11-16 18:46:59 +0300 |
commit | 7accd3a662569b3c23e456f1560e35cab95280f6 (patch) | |
tree | 61a4f3a5f244c772fac012f680ed7fb71c2745de /source/blender/makesdna | |
parent | ad700ba24fbc8ee8e216090bdb8157234409b29d (diff) |
Long outstanding feature request: "Multi Modifier"
This allows to mix between the result of 2 modifiers, with both
using the same input state. This is useful for having a mesh deform
and armature deform working together.
However! This functionality could have been presented better...
this is actually Node editor stuff!
Now it works by adding a "MM" button, next to the "overall vgroup"
option. If MM is pressed, the input of this modifier is the same as
the input of the previous modifier.
Only the armature modifier has this option now...
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index c55ae752ffb..0802fbf0e40 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -313,9 +313,10 @@ typedef struct WaveModifierData { typedef struct ArmatureModifierData { ModifierData modifier; - short deformflag, pad1; /* deformflag replaces armature->deformflag */ + short deformflag, multi; /* deformflag replaces armature->deformflag */ int pad2; struct Object *object; + float *prevCos; /* stored input of previous modifier, for vertexgroup blending */ char defgrp_name[32]; } ArmatureModifierData; |