Revision: 38911
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38911
Author:   moguri
Date:     2011-08-02 05:49:11 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
BGE Animations: Fixing a crash when an fcurve actuator is found, but the object 
doesn't have animation data (adt). 

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c

Modified: branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c        
2011-08-02 05:31:32 UTC (rev 38910)
+++ branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c        
2011-08-02 05:49:11 UTC (rev 38911)
@@ -11752,7 +11752,8 @@
                                                aa->end = ia->end;
                                                strcpy(aa->name, ia->name);
                                                strcpy(aa->frameProp, 
ia->frameProp);
-                                               aa->act = ob->adt->action;
+                                               if (ob->adt)
+                                                       aa->act = 
ob->adt->action;
 
                                                // Get rid of the old actuator
                                                MEM_freeN(ia);

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to