[Bf-blender-cvs] [fa7623ee446] blender-v2.82-release: Fix (unreported) Separate bones creates empty armature

Philipp Oeser noreply at git.blender.org
Mon Mar 9 20:56:36 CET 2020


Commit: fa7623ee4469b298473308ffc81365dc8864c531
Author: Philipp Oeser
Date:   Thu Feb 27 15:47:32 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBfa7623ee4469b298473308ffc81365dc8864c531

Fix (unreported) Separate bones creates empty armature

Fix for fix (rB8bf7ca9fe31c).
The fix was not actually working [neither for multi-armature-editing as
intended nor for single armatures] and it broke single-armature bone
separation completely.

More or less indentation issue, move relevant code out of bone loop, do
after all bones have been checked, guess this was intended anyways.

Differential Revision: https://developer.blender.org/D6949

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

M	source/blender/editors/armature/armature_relations.c

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

diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c
index c2c7d7e5ee7..ae0501d14ef 100644
--- a/source/blender/editors/armature/armature_relations.c
+++ b/source/blender/editors/armature/armature_relations.c
@@ -639,14 +639,14 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
             has_selected_any = true;
           }
         }
-        if (has_selected_bone == false) {
-          if (has_selected_any) {
-            /* Without this, we may leave head/tail selected
-             * which isn't expected after separating. */
-            ED_armature_edit_deselect_all(ob_old);
-          }
-          continue;
+      }
+      if (has_selected_bone == false) {
+        if (has_selected_any) {
+          /* Without this, we may leave head/tail selected
+           * which isn't expected after separating. */
+          ED_armature_edit_deselect_all(ob_old);
         }
+        continue;
       }
     }



More information about the Bf-blender-cvs mailing list