# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1390438254 -7200
# Node ID ca549434dc956ee6eada6d7c7205e7196991aaf0
# Parent  af1310ed212b35208d0b3fedda9130d066aa5433
fixed a crashing bug in anm_destroy_node introduced when I added the multiple animations per node

diff -r af1310ed212b -r ca549434dc95 Makefile
--- a/Makefile	Sun Jan 19 14:56:44 2014 +0200
+++ b/Makefile	Thu Jan 23 02:50:54 2014 +0200
@@ -73,6 +73,13 @@
 clean:
 	rm -f $(obj) $(lib_a) $(lib_so)
 
+.PHONY: cleanlibs
+cleanlibs:
+	$(MAKE) -C libs/openctm clean
+	$(MAKE) -C libs/tinyxml2 clean
+	$(MAKE) -C libs/vmath clean
+	$(MAKE) -C libs/anim clean
+
 .PHONY: cleandep
 cleandep:
 	rm -f $(dep)
diff -r af1310ed212b -r ca549434dc95 converters/ass2goat/src/main.c
--- a/converters/ass2goat/src/main.c	Sun Jan 19 14:56:44 2014 +0200
+++ b/converters/ass2goat/src/main.c	Thu Jan 23 02:50:54 2014 +0200
@@ -288,7 +288,7 @@
 
 	lastdot = strrchr(fname, '.');
 
-	fname_end = lastdot ? lastdot + 1 : fname + strlen(fname);
+	fname_end = lastdot ? lastdot : fname + strlen(fname);
 	namesz = fname_end - fname;
 	reqsz = namesz + strlen(suffix) + 2;	/* plus 1 for the dot */
 
diff -r af1310ed212b -r ca549434dc95 libs/anim/anim.c
--- a/libs/anim/anim.c	Sun Jan 19 14:56:44 2014 +0200
+++ b/libs/anim/anim.c	Thu Jan 23 02:50:54 2014 +0200
@@ -75,10 +75,11 @@
 
 void anm_destroy_node(struct anm_node *node)
 {
-	int i;
+	int i, num_anim;
 	free(node->name);
 
-	for(i=0; i<ANM_NUM_TRACKS; i++) {
+	num_anim = anm_get_animation_count(node);
+	for(i=0; i<num_anim; i++) {
 		anm_destroy_animation(node->animations + i);
 	}
 	dynarr_free(node->animations);
diff -r af1310ed212b -r ca549434dc95 src/node.cc
--- a/src/node.cc	Sun Jan 19 14:56:44 2014 +0200
+++ b/src/node.cc	Thu Jan 23 02:50:54 2014 +0200
@@ -26,6 +26,8 @@
 
 void g3dimpl::delete_node_tree(Node *n)
 {
+	if(!n) return;
+
 	for(int i=0; i<n->get_children_count(); i++) {
 		delete_node_tree((Node*)n->get_child(i));
 	}