From 47d13fecfbb7f2111ccd71b5376c8c3094ca1558 Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Fri, 7 Feb 2020 17:46:29 +0100 Subject: Fix T73660: Hide envelop option for Grease Pencil weights generation As this feature is not supported yet, it's better to hide for grease pencil. Differential Revision: https://developer.blender.org/D6777 --- source/blender/editors/object/object_relations.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 080c6400d31..9057922906c 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1054,7 +1054,9 @@ static int parent_set_invoke_menu(bContext *C, wmOperatorType *ot) if (parent->type == OB_ARMATURE) { uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE); uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE_NAME); - uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE_ENVELOPE); + if (!has_children_of_type.gpencil) { + uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE_ENVELOPE); + } if (has_children_of_type.mesh || has_children_of_type.gpencil) { uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE_AUTO); } -- cgit v1.2.3