[Bf-blender-cvs] [52aa1f3c6c1] blender2.8: Merge branch 'master' into blender2.8

[Philipp Oeser]

Commit: 52aa1f3c6c1c5b8a12db5165da1a29e5b7b04c0f
Author: Philipp Oeser
Date:   Fri May 4 10:31:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB52aa1f3c6c1c5b8a12db5165da1a29e5b7b04c0f

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/modifiers/intern/MOD_particleinstance.c
index 56f6fa57b51,97f01ac8ab1..b93e567fe56
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@@ -213,10 -229,10 +213,10 @@@ static DerivedMesh *applyModifier(Modif
  	MPoly *mpoly, *orig_mpoly;
  	MLoop *mloop, *orig_mloop;
  	MVert *mvert, *orig_mvert;
- 	int totvert, totpoly, totloop /* , totedge */;
- 	int maxvert, maxpoly, maxloop, part_end = 0, part_start;
+ 	int totvert, totpoly, totloop , totedge;
+ 	int maxvert, maxpoly, maxloop, maxedge, part_end = 0, part_start;
  	int k, p, p_skip;
 -	short track = ob->trackflag % 3, trackneg, axis = pimd->axis;
 +	short track = ctx->object->trackflag % 3, trackneg, axis = pimd->axis;
  	float max_co = 0.0, min_co = 0.0, temp_co[3];
  	float *size = NULL;
  	float spacemat[4][4];