[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40322] trunk/blender: fix for crash loading a file saved with fluidsim when blenders compiled with it disabled .

[Campbell Barton]

Revision: 40322
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40322
Author:   campbellbarton
Date:     2011-09-18 11:08:34 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
fix for crash loading a file saved with fluidsim when blenders compiled with it disabled.
also remove unneed class prefix on function name for itasc.

Modified Paths:
--------------
    trunk/blender/intern/itasc/kdl/frames.hpp
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/intern/itasc/kdl/frames.hpp
===================================================================
--- trunk/blender/intern/itasc/kdl/frames.hpp	2011-09-18 10:34:13 UTC (rev 40321)
+++ trunk/blender/intern/itasc/kdl/frames.hpp	2011-09-18 11:08:34 UTC (rev 40322)
@@ -299,7 +299,7 @@
     double data[9];
 
     inline Rotation() {
-		*this = Rotation::Identity();
+		*this = Identity();
 	}
     inline Rotation(double Xx,double Yx,double Zx,
                 double Xy,double Yy,double Zy,

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-09-18 10:34:13 UTC (rev 40321)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-09-18 11:08:34 UTC (rev 40322)
@@ -4028,8 +4028,10 @@
 			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;