Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Genrich <daniel.genrich@gmx.net>2011-06-13 04:02:23 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2011-06-13 04:02:23 +0400
commitef1824cdcb9d78dd22316d48fd2d9c8bb6f41fa3 (patch)
tree168569a84a8670fef2d3fcb2490b62f480f5c450 /source/blender/editors/physics
parent5745f99deed89e547da87235f934c477675dd747 (diff)
Elbeem / Fluidsim:
a) Also fixed an "upcomming" bug in regard of gravx,y,z now converted into an array. b) Little typo fix
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r--source/blender/editors/physics/physics_fluid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index d54048546fe..d54d608d2c7 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -443,7 +443,7 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid
for (fobj=fobjects->first; fobj; fobj=fobj->next) {
Object *ob = fobj->object;
FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim);
- float active= (float)(fluidmd->fss->flag && OB_FLUIDSIM_ACTIVE);
+ float active= (float)(fluidmd->fss->flag & OB_FLUIDSIM_ACTIVE);
float rot_d[3] = {0.f, 0.f, 0.f}, old_rot[3] = {0.f, 0.f, 0.f};
if (ELEM(fluidmd->fss->type, OB_FLUIDSIM_DOMAIN, OB_FLUIDSIM_PARTICLE))