Revision: 36048
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36048
Author:   campbellbarton
Date:     2011-04-08 02:21:43 +0000 (Fri, 08 Apr 2011)
Log Message:
-----------
fix [#26830] Blender crashes when opening this file
was linking NLA fcurve modifiers as fcurves (wrong function call).

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c   2011-04-08 
01:40:54 UTC (rev 36047)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2011-04-08 
02:21:43 UTC (rev 36048)
@@ -234,8 +234,8 @@
 
 /* local prototypes */
 static void *read_struct(FileData *fd, BHead *bh, const char *blockname);
+static void direct_link_modifiers(FileData *fd, ListBase *lb);
 
-
 static OldNewMap *oldnewmap_new(void) 
 {
        OldNewMap *onm= MEM_callocN(sizeof(*onm), "OldNewMap");
@@ -1894,7 +1894,7 @@
                
                /* strip's F-Modifiers */
                link_list(fd, &strip->modifiers);
-               direct_link_fcurves(fd, &strip->modifiers);
+               direct_link_modifiers(fd, &strip->modifiers);
        }
 }
 

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

Reply via email to