[Bf-blender-cvs] [2332051419d] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 2332051419d9aeb99477335e64720b82b106426a
Author: Campbell Barton
Date:   Sat Aug 19 21:54:05 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB2332051419d9aeb99477335e64720b82b106426a

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/python/intern/gpu_offscreen.c
index 1fb866b70b7,3c340d14e3f..6c16c274234
--- a/source/blender/python/intern/gpu_offscreen.c
+++ b/source/blender/python/intern/gpu_offscreen.c
@@@ -210,12 -177,11 +180,12 @@@ static PyObject *pygpu_offscreen_draw_v
  	BPY_GPU_OFFSCREEN_CHECK_OBJ(self);
  
  	if (!PyArg_ParseTupleAndKeywords(
 -	        args, kwds, "OOOO&O&:draw_view3d", (char **)(kwlist),
 -	        &py_scene, &py_view3d, &py_region,
 +	        args, kwds, "OOOOO&O&:draw_view3d", (char **)(kwlist),
 +	        &py_scene, &py_scene_layer, &py_view3d, &py_region,
- 	        pygpu_offscreen_check_matrix, &py_mat_projection,
- 	        pygpu_offscreen_check_matrix, &py_mat_modelview) ||
+ 	        Matrix_Parse4x4, &py_mat_projection,
+ 	        Matrix_Parse4x4, &py_mat_modelview) ||
  	    (!(scene    = PyC_RNA_AsPointer(py_scene, "Scene")) ||
 +	     !(sl       = PyC_RNA_AsPointer(py_scene_layer, "SceneLayer")) ||
  	     !(v3d      = PyC_RNA_AsPointer(py_view3d, "SpaceView3D")) ||
  	     !(ar       = PyC_RNA_AsPointer(py_region, "Region"))))
  	{