diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 04:05:08 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 04:05:08 +0300 |
commit | 6fbd210b9151e5c401330ca930b724f4d781bc48 (patch) | |
tree | 8a197b21148e5c1589a61837b8cf920b6f54b9e9 /source/blender/python/bmesh/bmesh_py_types_meshdata.c | |
parent | cb58658f4145239082573aec49f261ce389a03ca (diff) | |
parent | 931a279f441f6f9c3266d4789e9aa5aed1c16aa8 (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 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 4e55495a0cd..34c086c04c1 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -192,7 +192,7 @@ static int bpy_bmvertskin_radius_set(BPy_BMVertSkin *self, PyObject *value, void } PyDoc_STRVAR(bpy_bmvertskin_flag__use_root_doc, -"Use as root vertex.\n\n:type: boolean" +"Use as root vertex. Setting this flag does not clear other roots in the same mesh island.\n\n:type: boolean" ); PyDoc_STRVAR(bpy_bmvertskin_flag__use_loose_doc, "Use loose vertex.\n\n:type: boolean" @@ -221,17 +221,16 @@ static int bpy_bmvertskin_flag_set(BPy_BMVertSkin *self, PyObject *value, void * } } -/* XXX Todo: Make root settable, currently the code to disable all other verts as roots sits within the modifier */ static PyGetSetDef bpy_bmvertskin_getseters[] = { /* attributes match rna_mesh_gen */ {(char *)"radius", (getter)bpy_bmvertskin_radius_get, (setter)bpy_bmvertskin_radius_set, (char *)bpy_bmvertskin_radius_doc, NULL}, - {(char *)"use_root", (getter)bpy_bmvertskin_flag_get, (setter)NULL, (char *)bpy_bmvertskin_flag__use_root_doc, (void *)MVERT_SKIN_ROOT}, + {(char *)"use_root", (getter)bpy_bmvertskin_flag_get, (setter)bpy_bmvertskin_flag_set, (char *)bpy_bmvertskin_flag__use_root_doc, (void *)MVERT_SKIN_ROOT}, {(char *)"use_loose", (getter)bpy_bmvertskin_flag_get, (setter)bpy_bmvertskin_flag_set, (char *)bpy_bmvertskin_flag__use_loose_doc, (void *)MVERT_SKIN_LOOSE}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; -static PyTypeObject BPy_BMVertSkin_Type; /* bm.loops.layers.uv.active */ +static PyTypeObject BPy_BMVertSkin_Type; /* bm.loops.layers.skin.active */ static void bm_init_types_bmvertskin(void) { |