[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18687] branches/blender2.5/blender/source /blender: 2.5 - Bugfixes for loading ManCandy

[Joshua Leung]

Revision: 18687
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18687
Author:   aligorith
Date:     2009-01-27 03:31:39 +0100 (Tue, 27 Jan 2009)

Log Message:
-----------
2.5 - Bugfixes for loading ManCandy

* Objects parented to bones now load correctly again (so Mancandy no longer looks like he had a run-in with a lawn mulcher). Was caused by a typo. I'm not sure how that got in there (or who did it)

* Action/Graph Editors would crash when loading files with Materials with some drivers.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
    branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/object.c	2009-01-26 23:58:56 UTC (rev 18686)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/object.c	2009-01-27 02:31:39 UTC (rev 18687)
@@ -1617,7 +1617,7 @@
 	bPoseChannel *pchan;
 	float vec[3];
 	
-	if (ob->type!=OB_ARMATURE) {
+	if (par->type!=OB_ARMATURE) {
 		Mat4One(mat);
 		return;
 	}

Modified: branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c	2009-01-26 23:58:56 UTC (rev 18686)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c	2009-01-27 02:31:39 UTC (rev 18687)
@@ -716,7 +716,7 @@
 			Material *ma= give_current_material(ob, a);
 			
 			/* for now, if no material returned, skip (this shouldn't confuse the user I hope) */
-			if (ELEM(NULL, ma, ma->adt)) continue;
+			if (ELEM3(NULL, ma, ma->adt, ma->adt->action)) continue;
 			
 			/* include material-expand widget? */
 			// hmm... do we need to store the index of this material in the array anywhere?