[Bf-blender-cvs] [7f89bc8] master: Fix rare crash duplicating fluidsim
Campbell Barton
noreply at git.blender.org
Sun May 24 16:20:27 CEST 2015
Commit: 7f89bc8e8502cdf8b62221265b564fce4219332f
Author: Campbell Barton
Date: Mon May 25 00:13:14 2015 +1000
Branches: master
https://developer.blender.org/rB7f89bc8e8502cdf8b62221265b564fce4219332f
Fix rare crash duplicating fluidsim
===================================================================
M source/blender/modifiers/intern/MOD_fluidsim.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c
index 8d2774a..c202c5e 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim.c
@@ -72,7 +72,7 @@ static void copyData(ModifierData *md, ModifierData *target)
MEM_freeN(tfluidmd->fss);
tfluidmd->fss = MEM_dupallocN(fluidmd->fss);
- if (tfluidmd->fss->meshVelocities != NULL) {
+ if (tfluidmd->fss && (tfluidmd->fss->meshVelocities != NULL)) {
tfluidmd->fss->meshVelocities = MEM_dupallocN(tfluidmd->fss->meshVelocities);
}
}
More information about the Bf-blender-cvs
mailing list