[Bf-blender-cvs] [47d13fecfbb] master: Fix T73660: Hide envelop option for Grease Pencil weights generation

Antonio Vazquez noreply at git.blender.org
Fri Feb 7 17:58:49 CET 2020


Commit: 47d13fecfbb7f2111ccd71b5376c8c3094ca1558
Author: Antonio Vazquez
Date:   Fri Feb 7 17:46:29 2020 +0100
Branches: master
https://developer.blender.org/rB47d13fecfbb7f2111ccd71b5376c8c3094ca1558

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

===================================================================

M	source/blender/editors/object/object_relations.c

===================================================================

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);
     }



More information about the Bf-blender-cvs mailing list