sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for crash loading a file saved with fluidsim when blenders compiled with it disabled.

Browse Source 
also remove unneed class prefix on function name for itasc.
This commit is contained in:
Campbell Barton 2011-09-18 11:08:34 +00:00
parent 53845a37d9
commit 507aa1cd22
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/itasc/kdl/frames.hpp
View 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,

6
source/blender/blenloader/intern/readfile.c
View 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;