diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:23:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:24:20 +0300 |
| commit | 9a11aeb300cef2eef5df3b606468a6bcdaca3550 (patch) | |
| tree | 7265ef366b503021c8d18497d04b49a374309829 /source/blender/blenkernel/intern/boids.c | |
| parent | 3a14a0381288ae9f49d1ab489a250cd29a00e771 (diff) | |
| parent | 95eb9f22e69622c5817707fa9534521613e7d7cc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/boids.c')
| -rw-r--r-- | source/blender/blenkernel/intern/boids.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index f440ce711ff..4b92715ee7b 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -162,8 +162,10 @@ static int rule_goal_avoid(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, copy_v3_v3(bbd->goal_nor, efd.nor); } } - else if (rule->type == eBoidRuleType_Avoid && bpa->data.mode == eBoidMode_Climbing && - priority > 2.0f * gabr->fear_factor) { + else if ((rule->type == eBoidRuleType_Avoid) && + (bpa->data.mode == eBoidMode_Climbing) && + (priority > 2.0f * gabr->fear_factor)) + { /* detach from surface and try to fly away from danger */ negate_v3_v3(efd.vec_to_point, bpa->gravity); } @@ -1107,7 +1109,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa) /* jump to go faster */ if (jump == 0 && val.jump_speed > val.max_speed && bbd->wanted_speed > val.max_speed) { - + /* pass */ } if (jump) { |