diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-29 18:36:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-29 18:38:16 +0300 |
| commit | 0efecba957eea45621c004217a76448f11f0376d (patch) | |
| tree | 26a11c55c969a8c4389f9797f5e46b3d7ed186fc /source/blender/editors/physics | |
| parent | 21105e1b1f1266a3846462588bdbe840d09758ea (diff) | |
| parent | 39eb05161690510ecec4c30129a9f8d5532d39c9 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index f73cdc30292..9c7c9fde066 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3764,7 +3764,8 @@ static void brush_add_count_iter( &min_d, &add_pars[iter].num_dmcache, add_pars[iter].fuv, - 0, 0, 0, 0)) { + 0, 0, 0, 0)) + { if (psys->part->use_modifier_stack && !psmd_eval->mesh_final->runtime.deformed_only) { add_pars[iter].num = add_pars[iter].num_dmcache; add_pars[iter].num_dmcache = DMCACHE_ISCHILD; @@ -4645,7 +4646,8 @@ int PE_minmax(Scene *scene, ViewLayer *view_layer, float min[3], float max[3]) static struct ParticleSystem *psys_eval_get( Depsgraph *depsgraph, Object *object, - ParticleSystem *psys){ + ParticleSystem *psys) +{ Object *object_eval = DEG_get_evaluated_object(depsgraph, object); if (object_eval == object) { return psys; |