diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 15:19:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 15:19:51 +0300 |
| commit | a2c0a382cd00b9b1a3058ad0017887e451b73465 (patch) | |
| tree | be978c24be659a22afb22eb53c52c468e4087c06 /source/blender/editors/physics | |
| parent | feb7852e1ba55b4c7f697ec52fee672a8cc2261c (diff) | |
| parent | b3004d30f5d5060035c5f8ac4cb6338463872877 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/physics/particle_edit_undo.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 9deae22e4e1..14bcba3416f 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -4436,6 +4436,7 @@ void PE_create_particle_edit( recalc_lengths(edit); if (psys && !cache) recalc_emitter_field(ob, psys); + PE_update_object(eval_ctx, scene, ob, 1); } } diff --git a/source/blender/editors/physics/particle_edit_undo.c b/source/blender/editors/physics/particle_edit_undo.c index 1264800afc8..5199b1c54fa 100644 --- a/source/blender/editors/physics/particle_edit_undo.c +++ b/source/blender/editors/physics/particle_edit_undo.c @@ -44,11 +44,9 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BKE_global.h" #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_context.h" -#include "BKE_main.h" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index bb29a619139..65ef3ad44d0 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -48,7 +48,6 @@ #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_fluidsim.h" -#include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_report.h" |