diff options
| author | Luca Rood <dev@lucarood.com> | 2017-02-18 09:10:53 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-02-18 09:12:29 +0300 |
| commit | a2ed635a73330d66eaf9edb308a00576e7b10bcb (patch) | |
| tree | 8381e2243ffcb02ed5db958aa94f704d1dc60339 | |
| parent | b3aead8fd74c46f3c3156381685c6d2bd54eb730 (diff) | |
Fix typo and change `.enabled` to `.active`surface-deform-modifier
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_surfacedeform.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index daa5ff2d39e..e8601dc9081 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -949,7 +949,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def SURFACE_DEFORM(self, layout, ob, md): col = layout.column() - col.enabled = not md.is_bound + col.active = not md.is_bound col.prop(md, "target") col.prop(md, "falloff") diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 03ae6aab4ca..5e852e84516 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -1006,11 +1006,11 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd, float (*vertexCos) freeData((ModifierData *)smd); } else if (data.success == MOD_SDEF_BIND_RESULT_CONCAVE_ERR) { - modifier_setError((ModifierData *)smd, "Target containts concave polys"); + modifier_setError((ModifierData *)smd, "Target contains concave polys"); freeData((ModifierData *)smd); } else if (data.success == MOD_SDEF_BIND_RESULT_OVERLAP_ERR) { - modifier_setError((ModifierData *)smd, "Target containts overlapping verts"); + modifier_setError((ModifierData *)smd, "Target contains overlapping verts"); freeData((ModifierData *)smd); } else if (data.success == MOD_SDEF_BIND_RESULT_GENERIC_ERR) { |