diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 04:33:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 04:33:42 +0300 |
| commit | 441177b1c79f7ee8fb3764feb5a1ee1fc97ec263 (patch) | |
| tree | 745aa4f65183c120d811c72f282318757ed79daa | |
| parent | 6fbd210b9151e5c401330ca930b724f4d781bc48 (diff) | |
| parent | d07d3e0987d5b4caf86ae1dc4749c0062a5b6189 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 6 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_meshdata.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 7eed5e03d01..50f2d49c1b5 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -3140,9 +3140,9 @@ static void rna_def_skin_vertices(BlenderRNA *brna, PropertyRNA *UNUSED(cprop)) prop = RNA_def_property(srna, "use_root", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MVERT_SKIN_ROOT); - RNA_def_property_ui_text(prop, "Root", - "Vertex is a root for rotation calculations and armature generation, " - "setting this flag does not clear other roots in the same mesh island"); + RNA_def_property_ui_text(prop, "Root", + "Vertex is a root for rotation calculations and armature generation, " + "setting this flag does not clear other roots in the same mesh island"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop = RNA_def_property(srna, "use_loose", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 34c086c04c1..62981798b1a 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -224,7 +224,7 @@ static int bpy_bmvertskin_flag_set(BPy_BMVertSkin *self, PyObject *value, void * 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)bpy_bmvertskin_flag_set, (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 */ |