fix for crash loading a file saved with fluidsim when blenders compiled with it disabled.
authorCampbell Barton <ideasman42@gmail.com>
Sun, 18 Sep 2011 11:08:34 +0000 (11:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 18 Sep 2011 11:08:34 +0000 (11:08 +0000)
also remove unneed class prefix on function name for itasc.

intern/itasc/kdl/frames.hpp
source/blender/blenloader/intern/readfile.c

index 01213f91d5a34391673731311442ee09c591e4f0..2a1ed3296f998330024763da5039139eb454ed0b 100644 (file)
@@ -299,7 +299,7 @@ public:
     double data[9];
 
     inline Rotation() {
-               *this = Rotation::Identity();
+               *this = Identity();
        }
     inline Rotation(double Xx,double Yx,double Zx,
                 double Xy,double Yy,double Zy,
index a5748201d3288a56d2c9a225d33a0627bb9f0d0d..38454547f483d5ca6b8c1e0fb86c695ed59a5f20 100644 (file)
@@ -4028,8 +4028,10 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
                        FluidsimModifierData *fluidmd = (FluidsimModifierData*) md;
                        
                        fluidmd->fss= newdataadr(fd, fluidmd->fss);
-                       fluidmd->fss->fmd= fluidmd;
-                       fluidmd->fss->meshVelocities = NULL;
+                       if(fluidmd->fss) {
+                               fluidmd->fss->fmd= fluidmd;
+                               fluidmd->fss->meshVelocities = NULL;
+                       }
                }
                else if (md->type==eModifierType_Smoke) {
                        SmokeModifierData *smd = (SmokeModifierData*) md;