[Bf-blender-cvs] [8b54c524bea] sculpt-mode-features: Merge branch 'master' into sculpt-mode-features

[Pablo Dobarro]

Commit: 8b54c524beaf6517450675d954c3a00e4956ebdf
Author: Pablo Dobarro
Date:   Wed Apr 3 01:03:31 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rB8b54c524beaf6517450675d954c3a00e4956ebdf

Merge branch 'master' into sculpt-mode-features

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



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

diff --cc source/blender/editors/space_view3d/view3d_edit.c
index 9c57975ba8b,19008ebd122..4cbed2b3861
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -507,13 -505,12 +507,14 @@@ static void viewops_data_create
  		negate_v3_v3(tvec, rv3d->ofs);
  		vod->init.zfac = ED_view3d_calc_zfac(rv3d, tvec, NULL);
  	}
 -
 +	vod->C = C;
  	vod->reverse = 1.0f;
- 	if (rv3d->persmat[2][1] < 0.0f)
+ 	if (rv3d->persmat[2][1] < 0.0f) {
  		vod->reverse = -1.0f;
+ 	}
  
 +	copy_v3_v3(vod->init.viewpos, rv3d->viewinv[3]);
 +
  	rv3d->rflag |= RV3D_NAVIGATING;
  }
  
diff --cc source/blender/makesdna/DNA_mesh_types.h
index 098337b6431,0d43b14e252..a3632412d82
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@@ -187,10 -187,9 +187,11 @@@ typedef struct Mesh 
  
  	short totcol;
  
 +	float voxel_size;
 +	char _pad1[4];
  	/** Deprecated multiresolution modeling data, only keep for loading old files. */
  	struct Multires *mr DNA_DEPRECATED;
+ 	void *_pad1;
  
  	Mesh_Runtime runtime;
  } Mesh;