[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26560] trunk/blender/source/blender: linking in mesh data with animation crashed blender.

[Campbell Barton]

Revision: 26560
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26560
Author:   campbellbarton
Date:     2010-02-02 19:24:10 +0100 (Tue, 02 Feb 2010)

Log Message:
-----------
linking in mesh data with animation crashed blender. also fixed some warnings.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    trunk/blender/source/blender/editors/util/editmode_undo.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c   2010-02-02 
17:57:12 UTC (rev 26559)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2010-02-02 
18:24:10 UTC (rev 26560)
@@ -3310,6 +3310,7 @@
                        /*Link ID Properties -- and copy this comment EXACTLY 
for easy finding
                        of library blocks that implement this.*/
                        if (me->id.properties) 
IDP_LibLinkProperty(me->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), 
fd);
+                       if (me->adt) lib_link_animdata(fd, &me->id, me->adt);
 
                        /* this check added for python created meshes */
                        if(me->mat) {
@@ -3397,6 +3398,9 @@
        mesh->msticky= newdataadr(fd, mesh->msticky);
        mesh->dvert= newdataadr(fd, mesh->dvert);
        
+       mesh->adt= newdataadr(fd, mesh->adt);
+       direct_link_animdata(fd, mesh->adt);
+
        /* Partial-mesh visibility (do this before using totvert, totface, or 
totedge!) */
        mesh->pv= newdataadr(fd, mesh->pv);
        if(mesh->pv) {

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c    
2010-02-02 17:57:12 UTC (rev 26559)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c    
2010-02-02 18:24:10 UTC (rev 26560)
@@ -1536,10 +1536,12 @@
                        if(mface->v4) (me->dvert+mface->v4)->flag= 1;
                                        
                        if(brush->vertexpaint_tool==VP_BLUR) {
-                               MDeformWeight *dw, *(*dw_func)(MDeformVert *, 
int) = defvert_verify_index;
+                               MDeformWeight *dw, *(*dw_func)(MDeformVert *, 
int);
                                                
                                if(wp->flag & VP_ONLYVGROUP)
-                                       dw_func= defvert_find_index;
+                                       dw_func= (void *)defvert_find_index; /* 
uses a const, cast to quiet warning */
+                               else
+                                       dw_func= defvert_verify_index;
                                                
                                dw= dw_func(me->dvert+mface->v1, ob->actdef-1);
                                if(dw) {paintweight+= dw->weight; totw++;}

Modified: trunk/blender/source/blender/editors/util/editmode_undo.c
===================================================================
--- trunk/blender/source/blender/editors/util/editmode_undo.c   2010-02-02 
17:57:12 UTC (rev 26559)
+++ trunk/blender/source/blender/editors/util/editmode_undo.c   2010-02-02 
18:24:10 UTC (rev 26560)
@@ -52,6 +52,7 @@
 #include "BKE_utildefines.h"
 
 #include "ED_util.h"
+#include "ED_mesh.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs