Merge branch 'master' into blender2.8
This commit is contained in:
commit
441177b1c7
|
@ -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);
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue