[Bf-blender-cvs] [40a1bc6] framebuffer: Correct names of RNA types

Campbell Barton noreply at git.blender.org
Mon Oct 19 17:41:43 CEST 2015


Commit: 40a1bc6c9d50ab70e019b7276e724bc492eabf16
Author: Campbell Barton
Date:   Tue Oct 20 02:30:23 2015 +1100
Branches: framebuffer
https://developer.blender.org/rB40a1bc6c9d50ab70e019b7276e724bc492eabf16

Correct names of RNA types

Also order args: scene, v3d, region...

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

M	source/blender/python/intern/gpu_offscreen.c

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

diff --git a/source/blender/python/intern/gpu_offscreen.c b/source/blender/python/intern/gpu_offscreen.c
index b7e532f..51e574d 100644
--- a/source/blender/python/intern/gpu_offscreen.c
+++ b/source/blender/python/intern/gpu_offscreen.c
@@ -206,7 +206,7 @@ PyDoc_STRVAR(pygpu_offscreen_draw_view3d_doc,
 );
 static PyObject *pygpu_offscreen_draw_view3d(PyGPUOffScreen *self, PyObject *args, PyObject *kwds)
 {
-	static const char *kwlist[] = {"scene", "region", "view3d", "projection_matrix", "modelview_matrix", NULL};
+	static const char *kwlist[] = {"scene", "view3d", "region", "projection_matrix", "modelview_matrix", NULL};
 
 	MatrixObject *py_mat_modelview, *py_mat_projection;
 	PyObject *py_scene, *py_region, *py_view3d;
@@ -221,12 +221,12 @@ static PyObject *pygpu_offscreen_draw_view3d(PyGPUOffScreen *self, PyObject *arg
 
 	if (!PyArg_ParseTupleAndKeywords(
 	        args, kwds, "OOOO&O&:draw_view3d", (char **)(kwlist),
-	        &py_scene, &py_region, &py_view3d,
+	        &py_scene, &py_view3d, &py_region,
 	        pygpu_offscreen_check_matrix, &py_mat_projection,
 	        pygpu_offscreen_check_matrix, &py_mat_modelview) ||
 	    (!(scene    = PyC_RNA_AsPointer(py_scene, "Scene")) ||
-	     !(ar       = PyC_RNA_AsPointer(py_region, "ARegion")) ||
-	     !(v3d      = PyC_RNA_AsPointer(py_view3d, "View3D"))))
+	     !(v3d      = PyC_RNA_AsPointer(py_view3d, "SpaceView3D")) ||
+	     !(ar       = PyC_RNA_AsPointer(py_region, "Region"))))
 	{
 		return NULL;
 	}




More information about the Bf-blender-cvs mailing list