kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Shrink Wrap modifier: invert vgroup option

Browse Source 
D1839 from @Orgold
This commit is contained in:
Campbell Barton 2016-03-07 11:24:03 +11:00
parent 5fd0c1ed3f
commit d086f6aa5c
5 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@ -738,7 +738,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col.prop(md, "target", text="")
col = split.column()
col.label(text="Vertex Group:")
col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
row = col.row(align=True)
row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
row.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT')
split = layout.split()

1
source/blender/blenkernel/BKE_shrinkwrap.h
View File

@ -67,6 +67,7 @@ typedef struct ShrinkwrapCalcData {
struct MDeformVert *dvert; //Pointer to mdeform array
int vgroup; //Vertex group num
bool invert_vgroup; /* invert vertex group influence */
struct DerivedMesh *target; //mesh we are shrinking to
struct SpaceTransform local2target; //transform to move between local and target space

11
source/blender/blenkernel/intern/shrinkwrap.c
View File

@ -96,6 +96,11 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc)
float *co = calc->vertexCos[i];
float tmp_co[3];
float weight = defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup);
if (calc->invert_vgroup) {
weight = 1.0f - weight;
}
if (weight == 0.0f) {
continue;
}
@ -411,6 +416,11 @@ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc)
float *co = calc->vertexCos[i];
float tmp_co[3];
float weight = defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup);
if (calc->invert_vgroup) {
weight = 1.0f - weight;
}
if (weight == 0.0f) continue;
/* Convert the vertex to tree coordinates */
@ -480,6 +490,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM
calc.ob = ob;
calc.numVerts = numVerts;
calc.vertexCos = vertexCos;
calc.invert_vgroup = (smd->shrinkOpts & MOD_SHRINKWRAP_INVERT_VGROUP) != 0;
/* DeformVertex */
calc.vgroup = defgroup_name_index(calc.ob, calc.smd->vgroup_name);

2
source/blender/makesdna/DNA_modifier_types.h
View File

@ -825,6 +825,8 @@ enum {
MOD_SHRINKWRAP_CULL_TARGET_BACKFACE = (1 << 4),
MOD_SHRINKWRAP_KEEP_ABOVE_SURFACE = (1 << 5), /* distance is measure to the front face of the target */
MOD_SHRINKWRAP_INVERT_VGROUP = (1 << 6),
};
/* Shrinkwrap->projAxis */

5
source/blender/makesrna/intern/rna_modifier.c
View File

@ -3043,6 +3043,11 @@ static void rna_def_modifier_shrinkwrap(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_KEEP_ABOVE_SURFACE);
RNA_def_property_ui_text(prop, "Keep Above Surface", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
}
static void rna_def_modifier_fluidsim(BlenderRNA *brna)