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:
authorDalai Felinto <dfelinto@gmail.com>2017-11-09 18:11:20 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-11-09 18:23:41 +0300
commitc35f1d05eaa13348d4f33cdb44f6fb62f68e1ba3 (patch)
tree698066b5eade15949b0453796c4d9fc466df42ac /source/blender/blenkernel/intern/particle_system.c
parent09d26cab0bdde16529debd3e0271252012ba69eb (diff)
Farewell Scene->basact
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index ddf4f04c808..14f67aaea39 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -90,6 +90,8 @@
#include "BKE_scene.h"
#include "BKE_bvhutils.h"
+#include "DEG_depsgraph.h"
+
#include "PIL_time.h"
#include "RE_shader_ext.h"
@@ -2931,7 +2933,7 @@ static void psys_update_path_cache(ParticleSimulationData *sim, float cfra, cons
skip = 1; /* draw visualization */
else if (psys->pointcache->flag & PTCACHE_BAKING)
skip = 1; /* no need to cache paths while baking dynamics */
- else if (psys_in_edit_mode(sim->scene, psys)) {
+ else if (psys_in_edit_mode(sim->eval_ctx->scene_layer, psys)) {
if ((pset->flag & PE_DRAW_PART)==0)
skip = 1;
else if (part->childtype==0 && (psys->flag & PSYS_HAIR_DYNAMICS && psys->pointcache->flag & PTCACHE_BAKED)==0)