Commit: f23ed929ee021e11e8d47973d25f9039e9f91c17
Author: Bastien Montagne
Date: Tue Jul 4 13:13:49 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBf23ed929ee021e11e8d47973d25f9039e9f91c17
Merge branch 'master' into blender2.8
Conflicts:
source/blender/makesdna/DNA_particle_types.h
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_particle_types.h
index cde8eef6ef3,f6bed37dfa2..d0dfe18d0c4
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@@ -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 {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
