diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-07-28 05:38:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-28 05:38:48 +0400 |
commit | fb99e23205aa1eb7b3f47b8f43e8b812f598a574 (patch) | |
tree | b3d94ce89f9293032af7e7e99c089eaa7ae5a207 /source/blender/makesdna/DNA_modifier_types.h | |
parent | b830c0e394f25bf8d7ee7265b912a7e2489bdbe1 (diff) |
minor cleanup of rna
- use an rna enum-set for proximity vert/edge/face options.
- rename some flags.
- better conform to rna naming conventions.
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 2b1111e1308..cc8da863c44 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -810,7 +810,7 @@ typedef struct WeightVGEditModifierData { float add_threshold, rem_threshold; /* Clamping options. */ - float clamp_min_weight, clamp_max_weight; + float clamp_weight_min, clamp_weight_max; /* Masking options. */ float mask_constant; /* The global “influence”, if no vgroup nor tex is used as mask. */ @@ -846,7 +846,7 @@ typedef struct WeightVGEditModifierData { typedef struct WeightVGMixModifierData { ModifierData modifier; - /* XXX Note: I tried to keep everything logically ordered – provided the + /* XXX Note: I tried to keep everything logically ordered – provided the * alignment constraints… */ @@ -926,17 +926,17 @@ typedef struct WeightVGProximityModifierData { /* Modes of proximity weighting. */ /* Dist from target object to affected object. */ -#define MOD_WVG_PROXIMITY_OBJ2OBJDIST 1 +#define MOD_WVG_PROXIMITY_OBJECT 1 /* source vertex to other location */ /* Dist from target object to vertex. */ -#define MOD_WVG_PROXIMITY_OBJ2VERTDIST 2 +#define MOD_WVG_PROXIMITY_GEOMETRY 2 /* source vertex to other geometry */ /* Flags options for proximity weighting. */ -/* Use nearest vertices of target obj, in OVJ2VERTDIST mode. */ -#define MOD_WVG_PROXIMITY_O2VD_VERTS (1 << 0) -/* Use nearest edges of target obj, in OVJ2VERTDIST mode. */ -#define MOD_WVG_PROXIMITY_O2VD_EDGES (1 << 1) -/* Use nearest faces of target obj, in OVJ2VERTDIST mode. */ -#define MOD_WVG_PROXIMITY_O2VD_FACES (1 << 2) +/* Use nearest vertices of target obj, in MOD_WVG_PROXIMITY_GEOMETRY mode. */ +#define MOD_WVG_PROXIMITY_GEOM_VERTS (1 << 0) +/* Use nearest edges of target obj, in MOD_WVG_PROXIMITY_GEOMETRY mode. */ +#define MOD_WVG_PROXIMITY_GEOM_EDGES (1 << 1) +/* Use nearest faces of target obj, in MOD_WVG_PROXIMITY_GEOMETRY mode. */ +#define MOD_WVG_PROXIMITY_GEOM_FACES (1 << 2) /* Defines common to all WeightVG modifiers. */ /* Tex channel to be used as mask. */ |