[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43381] trunk/blender/source/blender/nodes /intern/node_common.c: fix [#29887] Alt + g in a node group results in crash

Campbell Barton ideasman42 at gmail.com
Sat Jan 14 19:11:46 CET 2012


Revision: 43381
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43381
Author:   campbellbarton
Date:     2012-01-14 18:11:45 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
fix [#29887] Alt + g in a node group results in crash 

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/node_common.c

Modified: trunk/blender/source/blender/nodes/intern/node_common.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_common.c	2012-01-14 18:07:09 UTC (rev 43380)
+++ trunk/blender/source/blender/nodes/intern/node_common.c	2012-01-14 18:11:45 UTC (rev 43381)
@@ -530,7 +530,8 @@
 		BLI_addtail(&ntree->links, link);
 	}
 	
-	/* and copy across the animation */
+	/* and copy across the animation,
+	 * note that the animation data's action can be NULL here */
 	if (wgroup->adt) {
 		LinkData *ld, *ldn=NULL;
 		bAction *waction;
@@ -550,7 +551,9 @@
 		}
 		
 		/* free temp action too */
-		free_libblock(&G.main->action, waction);
+		if (waction) {
+			free_libblock(&G.main->action, waction);
+		}
 	}
 	
 	/* delete the group instance. this also removes old input links! */




More information about the Bf-blender-cvs mailing list