[Bf-blender-cvs] [268508d2b01] geometry-nodes: Geometry Nodes: Make next modifier active when deleting

[Hans Goudey]

Commit: 268508d2b01b9d058d787c4a5c013d3413433bc7
Author: Hans Goudey
Date:   Tue Nov 24 13:52:20 2020 -0500
Branches: geometry-nodes
https://developer.blender.org/rB268508d2b01b9d058d787c4a5c013d3413433bc7

Geometry Nodes: Make next modifier active when deleting

Previously it was the previous modifier, but this change keeps the index
of the object's active modifier consistent when deleting a modifier.

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

M	source/blender/blenkernel/intern/modifier.c

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

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index de820786549..c9bdaecfa2a 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -221,12 +221,12 @@ void BKE_modifier_remove_from_list(Object *ob, ModifierData *md)
 
   if (md->flag & eModifierFlag_Active) {
     /* Prefer the previous modifier but use the next if this modifier is the first in the list. */
-    if (md->prev != NULL) {
-      BKE_object_modifier_set_active(ob, md->prev);
-    }
-    else if (md->next != NULL) {
+    if (md->next != NULL) {
       BKE_object_modifier_set_active(ob, md->next);
     }
+    else if (md->prev != NULL) {
+      BKE_object_modifier_set_active(ob, md->prev);
+    }
   }
 
   BLI_remlink(&ob->modifiers, md);