diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 12:57:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 12:57:49 +0300 |
commit | 43ce201125ff97e16a56b372a91442590498dacc (patch) | |
tree | 10b6ef3c41cab5b9cef0b93d99de0a14fca4157f /source/blender/python/bmesh/bmesh_py_types_meshdata.c | |
parent | 75188552a113f4dc226f21076f883ac3c11c9a98 (diff) | |
parent | 42103a3eb8e9ee341c89310cc2343bc21b6ae7e2 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python/bmesh/bmesh_py_types_meshdata.c')
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_meshdata.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 54b33e7b6b6..bc96ce606a9 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -38,6 +38,7 @@ #include "DNA_meshdata_types.h" #include "BLI_utildefines.h" +#include "BLI_math_base.h" #include "BLI_math_vector.h" #include "BKE_deform.h" @@ -465,7 +466,7 @@ static int bpy_bmdeformvert_ass_subscript(BPy_BMDeformVert *self, PyObject *key, return -1; } - dw->weight = CLAMPIS(f, 0.0f, 1.0f); + dw->weight = clamp_f(f, 0.0f, 1.0f); } } else { |