[Bf-blender-cvs] [a5df2a9b63a] master: Fix (unreported) two memleaks in clic-select ops of Action and NLA editors.

Bastien Montagne noreply at git.blender.org
Tue Apr 30 17:21:08 CEST 2019


Commit: a5df2a9b63ac0be47fc8d29fc9793c1614ca4dca
Author: Bastien Montagne
Date:   Tue Apr 30 17:05:34 2019 +0200
Branches: master
https://developer.blender.org/rBa5df2a9b63ac0be47fc8d29fc9793c1614ca4dca

Fix (unreported) two memleaks in clic-select ops of Action and NLA editors.

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

M	source/blender/editors/space_action/action_select.c
M	source/blender/editors/space_nla/nla_select.c

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

diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c
index bbbb9a09096..6082e942842 100644
--- a/source/blender/editors/space_action/action_select.c
+++ b/source/blender/editors/space_action/action_select.c
@@ -1553,11 +1553,11 @@ static void mouse_action_keys(bAnimContext *ac,
 
     /* cleanup temporary lists */
     BLI_dlrbTree_free(&anim_keys);
-
-    /* free list of channels, since it's not used anymore */
-    ANIM_animdata_freelist(&anim_data);
   }
 
+  /* free list of channels, since it's not used anymore */
+  ANIM_animdata_freelist(&anim_data);
+
   /* For replacing selection, if we have somthing to select, we have to clear existing selection.
    * The same goes if we found nothing to select, and deselect_all is true
    * (deselect on nothing behavior). */
diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c
index cb54129a820..1062a86f590 100644
--- a/source/blender/editors/space_nla/nla_select.c
+++ b/source/blender/editors/space_nla/nla_select.c
@@ -586,11 +586,11 @@ static void mouse_nla_strips(bContext *C, bAnimContext *ac, const int mval[2], s
     /* remove active channel from list of channels for separate treatment
      * (since it's needed later on) */
     BLI_remlink(&anim_data, ale);
-
-    /* free list of channels, since it's not used anymore */
-    ANIM_animdata_freelist(&anim_data);
   }
 
+  /* free list of channels, since it's not used anymore */
+  ANIM_animdata_freelist(&anim_data);
+
   /* if currently in tweakmode, exit tweakmode before changing selection states
    * now that we've found our target...
    */



More information about the Bf-blender-cvs mailing list