[Bf-blender-cvs] [a2ed635a73] surface-deform-modifier: Fix typo and change `.enabled` to `.active`

[Luca Rood]

Commit: a2ed635a73330d66eaf9edb308a00576e7b10bcb
Author: Luca Rood
Date:   Sat Feb 18 04:10:53 2017 -0200
Branches: surface-deform-modifier
https://developer.blender.org/rBa2ed635a73330d66eaf9edb308a00576e7b10bcb

Fix typo and change `.enabled` to `.active`

===================================================================

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/modifiers/intern/MOD_surfacedeform.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index daa5ff2d39..e8601dc908 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 03ae6aab4c..5e852e8451 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) {