[Bf-blender-cvs] [2cdbbfcc5a0] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 2cdbbfcc5a0f94fb841334edab3e22d7e3b42fab
Author: Campbell Barton
Date:   Thu May 3 19:53:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2cdbbfcc5a0f94fb841334edab3e22d7e3b42fab

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/modifiers/intern/MOD_solidify.c
index 43fceaae22a,280f3c771ed..e37bcccacfd
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@@ -908,8 -907,7 +909,8 @@@ static Mesh *applyModifier
  				int k;
  
  				/* note, only the first vertex (lower half of the index) is calculated */
 +				BLI_assert(ed->v1 < numVerts);
- 				normalize_v3_v3(nor_cpy, edge_vert_nos[ed->v1]);
+ 				normalize_v3_v3(nor_cpy, edge_vert_nos[ed_orig->v1]);
  
  				for (k = 0; k < 2; k++) { /* loop over both verts of the edge */
  					nor_short = mvert[*(&ed->v1 + k)].no;