[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34059] trunk/blender/source/blender: - use BKE_keyingset_free_path where paths were being freed inline.

[Campbell Barton]

Revision: 34059
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34059
Author:   campbellbarton
Date:     2011-01-04 09:56:25 +0100 (Tue, 04 Jan 2011)

Log Message:
-----------
- use BKE_keyingset_free_path where paths were being freed inline.
- rna_path was being freed when null, printing errors.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/anim_sys.c
    trunk/blender/source/blender/editors/animation/keyingsets.c
    trunk/blender/source/blender/editors/space_outliner/outliner.c

Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2011-01-04 08:00:16 UTC (rev 34058)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2011-01-04 08:56:25 UTC (rev 34059)
@@ -916,10 +916,11 @@
 	/* sanity check */
 	if ELEM(NULL, ks, ksp)
 		return;
-	
+
 	/* free RNA-path info */
-	MEM_freeN(ksp->rna_path);
-	
+	if(ksp->rna_path)
+		MEM_freeN(ksp->rna_path);
+
 	/* free path itself */
 	BLI_freelinkN(&ks->paths, ksp);
 }

Modified: trunk/blender/source/blender/editors/animation/keyingsets.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyingsets.c	2011-01-04 08:00:16 UTC (rev 34058)
+++ trunk/blender/source/blender/editors/animation/keyingsets.c	2011-01-04 08:56:25 UTC (rev 34059)
@@ -418,12 +418,9 @@
 			
 			/* try to find a path matching this description */
 			ksp= BKE_keyingset_find_path(ks, ptr.id.data, ks->name, path, index, KSP_GROUP_KSNAME);
-			
+
 			if (ksp) {
-				/* just free it... */
-				MEM_freeN(ksp->rna_path);
-				BLI_freelinkN(&ks->paths, ksp);
-				
+				BKE_keyingset_free_path(ks, ksp);
 				success= 1;
 			}
 			

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2011-01-04 08:00:16 UTC (rev 34058)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2011-01-04 08:56:25 UTC (rev 34059)
@@ -4144,12 +4144,9 @@
 						
 						if (ksp) {
 							/* free path's data */
-							// TODO: we probably need an API method for this 
-							if (ksp->rna_path) MEM_freeN(ksp->rna_path);
+							BKE_keyingset_free_path(ks, ksp);
+
 							ks->active_path= 0;
-							
-							/* remove path from set */
-							BLI_freelinkN(&ks->paths, ksp);
 						}
 					}
 						break;