diff options
6 files changed, 7 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 6370cc8942a..4e1056549a7 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -764,7 +764,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "mask_tex_use_channel", text="") 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': layout.prop_search(md, "mask_tex_uv_layer", ob.data, "uv_textures") diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 8dff0e376cb..a071284467b 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -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_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 " "coordinates from."); 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"); prop= RNA_def_property(srna, "min_dist", PROP_FLOAT, PROP_NONE); - RNA_def_property_range(prop, -FLT_MAX, FLT_MAX); - RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0); + RNA_def_property_range(prop, 0.0, FLT_MAX); + 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_update(prop, 0, "rna_Modifier_update"); prop= RNA_def_property(srna, "max_dist", PROP_FLOAT, PROP_NONE); - RNA_def_property_range(prop, -FLT_MAX, FLT_MAX); - RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0); + RNA_def_property_range(prop, 0.0, FLT_MAX); + 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_update(prop, 0, "rna_Modifier_update"); diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c index d688da4ba80..dc6ec638b4c 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.c +++ b/source/blender/modifiers/intern/MOD_weightvg_util.c @@ -250,4 +250,3 @@ void weightvg_update_vg(MDeformVert *dvert, int defgrp_idx, int num, } } } - diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index bcf2195d366..55f8716e0b0 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -328,4 +328,3 @@ ModifierTypeInfo modifierType_WeightVGEdit = { /* foreachIDLink */ foreachIDLink, /* foreachTexLink */ foreachTexLink, }; - diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index ba5ae5a2d70..a26a3d1e7f4 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -463,4 +463,3 @@ ModifierTypeInfo modifierType_WeightVGMix = { /* foreachIDLink */ foreachIDLink, /* foreachTexLink */ foreachTexLink, }; - diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 1acb3035d2a..3bd39b0417f 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -559,4 +559,3 @@ ModifierTypeInfo modifierType_WeightVGProximity = { /* foreachIDLink */ foreachIDLink, /* foreachTexLink */ foreachTexLink, }; - |