diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-11-25 14:17:08 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-11-25 14:17:08 +0300 |
| commit | 08b8b4465d55ca4f71cd392fa81a4ca858ed1d93 (patch) | |
| tree | 10a878da2230064351bd8493dd2997dc3f5e7194 /source/blender/blenkernel/BKE_particle.h | |
| parent | 6855c5dab667867cdf88d2425bc946caf4e1837a (diff) | |
| parent | 974ffaa39d8dd9f0bdd7bbf74648183b1937d3be (diff) | |
Merge branch 'blender2.8' into hair_guides
Diffstat (limited to 'source/blender/blenkernel/BKE_particle.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index f981295c5ad..fe1a30e0c6f 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -63,7 +63,7 @@ struct BVHTreeRay; struct BVHTreeRayHit; struct EdgeHash; struct EvaluationContext; -struct SceneLayer; +struct ViewLayer; #define PARTICLE_COLLISION_MAX_COLLISIONS 10 @@ -297,7 +297,7 @@ void psys_set_current_num(Object *ob, int index); struct LatticeDeformData *psys_create_lattice_deform_data(struct ParticleSimulationData *sim); -bool psys_in_edit_mode(struct SceneLayer *scene_layer, struct ParticleSystem *psys); +bool psys_in_edit_mode(struct ViewLayer *view_layer, struct ParticleSystem *psys); bool psys_check_enabled(struct Object *ob, struct ParticleSystem *psys, const bool use_render_params); bool psys_check_edited(struct ParticleSystem *psys); |