blender
/
blender
131
398
Fork 577
Code Issues 6.3k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-09-27 11:53:08 +10:00
parent 06846efdb0 09c7bfe42b
commit e2b6a59317
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/mesh/editmesh_extrude_spin.c
View File

@ -166,6 +166,21 @@ static int edbm_spin_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(e
return ret;
}
static bool edbm_spin_poll_property(const bContext *UNUSED(C), wmOperator *op, const PropertyRNA *prop)
{
const char *prop_id = RNA_property_identifier(prop);
const bool dupli = RNA_boolean_get(op->ptr, "dupli");
if (dupli) {
if (STREQ(prop_id, "use_auto_merge") ||
STREQ(prop_id, "use_normal_flip"))
{
return false;
}
}
return true;
}
void MESH_OT_spin(wmOperatorType *ot)
{
PropertyRNA *prop;
@ -179,6 +194,7 @@ void MESH_OT_spin(wmOperatorType *ot)
ot->invoke = edbm_spin_invoke;
ot->exec = edbm_spin_exec;
ot->poll = ED_operator_editmesh;
ot->poll_property = edbm_spin_poll_property;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;