forked from bartvdbraak/blender
- mask_tex_map_obj --> mask_tex_map_object
- dont allow negative min distances
This commit is contained in:
parent
57411d1c5f
commit
5fd8ffd242
@ -764,7 +764,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
|
|||||||
col.prop(md, "mask_tex_use_channel", text="")
|
col.prop(md, "mask_tex_use_channel", text="")
|
||||||
|
|
||||||
if md.mask_tex_mapping == 'OBJECT':
|
if md.mask_tex_mapping == 'OBJECT':
|
||||||
layout.prop(md, "mask_tex_map_obj", text="Object")
|
layout.prop(md, "mask_tex_map_object", text="Object")
|
||||||
elif md.mask_tex_mapping == 'UV' and ob.type == 'MESH':
|
elif md.mask_tex_mapping == 'UV' and ob.type == 'MESH':
|
||||||
layout.prop_search(md, "mask_tex_uv_layer", ob.data, "uv_textures")
|
layout.prop_search(md, "mask_tex_uv_layer", ob.data, "uv_textures")
|
||||||
|
|
||||||
|
@ -2542,7 +2542,8 @@ static void rna_def_modifier_weightvg_mask(BlenderRNA *brna, StructRNA *srna)
|
|||||||
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeightVGModifier_mask_uvlayer_set");
|
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeightVGModifier_mask_uvlayer_set");
|
||||||
RNA_def_property_update(prop, 0, "rna_Modifier_update");
|
RNA_def_property_update(prop, 0, "rna_Modifier_update");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "mask_tex_map_obj", PROP_POINTER, PROP_NONE);
|
prop= RNA_def_property(srna, "mask_tex_map_object", PROP_POINTER, PROP_NONE);
|
||||||
|
RNA_def_property_pointer_sdna(prop, NULL, "mask_tex_map_obj");
|
||||||
RNA_def_property_ui_text(prop, "Texture Coordinate Object", "Which object to take texture "
|
RNA_def_property_ui_text(prop, "Texture Coordinate Object", "Which object to take texture "
|
||||||
"coordinates from.");
|
"coordinates from.");
|
||||||
RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK);
|
RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK);
|
||||||
@ -2790,14 +2791,14 @@ static void rna_def_modifier_weightvgproximity(BlenderRNA *brna)
|
|||||||
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
|
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "min_dist", PROP_FLOAT, PROP_NONE);
|
prop= RNA_def_property(srna, "min_dist", PROP_FLOAT, PROP_NONE);
|
||||||
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
|
RNA_def_property_range(prop, 0.0, FLT_MAX);
|
||||||
RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
|
RNA_def_property_ui_range(prop, 0.0, 1000.0, 10, 0);
|
||||||
RNA_def_property_ui_text(prop, "Lowest Dist", "Distance mapping to weight 0.0.");
|
RNA_def_property_ui_text(prop, "Lowest Dist", "Distance mapping to weight 0.0.");
|
||||||
RNA_def_property_update(prop, 0, "rna_Modifier_update");
|
RNA_def_property_update(prop, 0, "rna_Modifier_update");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "max_dist", PROP_FLOAT, PROP_NONE);
|
prop= RNA_def_property(srna, "max_dist", PROP_FLOAT, PROP_NONE);
|
||||||
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
|
RNA_def_property_range(prop, 0.0, FLT_MAX);
|
||||||
RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
|
RNA_def_property_ui_range(prop, 0.0, 1000.0, 10, 0);
|
||||||
RNA_def_property_ui_text(prop, "Highest Dist", "Distance mapping to weight 1.0.");
|
RNA_def_property_ui_text(prop, "Highest Dist", "Distance mapping to weight 1.0.");
|
||||||
RNA_def_property_update(prop, 0, "rna_Modifier_update");
|
RNA_def_property_update(prop, 0, "rna_Modifier_update");
|
||||||
|
|
||||||
|
@ -250,4 +250,3 @@ void weightvg_update_vg(MDeformVert *dvert, int defgrp_idx, int num,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -328,4 +328,3 @@ ModifierTypeInfo modifierType_WeightVGEdit = {
|
|||||||
/* foreachIDLink */ foreachIDLink,
|
/* foreachIDLink */ foreachIDLink,
|
||||||
/* foreachTexLink */ foreachTexLink,
|
/* foreachTexLink */ foreachTexLink,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -463,4 +463,3 @@ ModifierTypeInfo modifierType_WeightVGMix = {
|
|||||||
/* foreachIDLink */ foreachIDLink,
|
/* foreachIDLink */ foreachIDLink,
|
||||||
/* foreachTexLink */ foreachTexLink,
|
/* foreachTexLink */ foreachTexLink,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -559,4 +559,3 @@ ModifierTypeInfo modifierType_WeightVGProximity = {
|
|||||||
/* foreachIDLink */ foreachIDLink,
|
/* foreachIDLink */ foreachIDLink,
|
||||||
/* foreachTexLink */ foreachTexLink,
|
/* foreachTexLink */ foreachTexLink,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user