Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 4 Jul 2017 11:13:49 +0000 (13:13 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 4 Jul 2017 11:13:49 +0000 (13:13 +0200)
Conflicts:
source/blender/makesdna/DNA_particle_types.h

1  2 
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_particle_types.h

index cde8eef6ef39dc4f7997bf759facf0c9b58d1b73,f6bed37dfa284c886ac27edc4fc40a24c9f71f09..d0dfe18d0c4588ed14557a176f6cd3fd99ebfc1d
@@@ -324,9 -323,7 +324,9 @@@ typedef struct ParticleSystem 
        struct ParticleDrawData *pdd;
  
        float dt_frac;                                                  /* current time step, as a fraction of a frame */
-       float _pad;                                                             /* spare capacity */
+       float lattice_strength;                                 /* influence of the lattice modifier */
 +
 +      void *batch_cache;
  } ParticleSystem;
  
  typedef enum eParticleDrawFlag {