Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 19 Aug 2017 11:54:05 +0000 (21:54 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 19 Aug 2017 11:54:05 +0000 (21:54 +1000)
1  2 
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/gpu_offscreen.c
tests/python/CMakeLists.txt

index 1fb866b70b78da615436b3cb237668b99ae4df85,3c340d14e3f7792f0c100e7a777ac70abc6dd702..6c16c274234f521c3d56239da987ac182f1f7344
@@@ -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"))))
        {
Simple merge