diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-06 15:00:46 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-06 15:00:46 +0300 |
| commit | a5cba9aab9a2ade00caefc1a7697f8fbd3f7304f (patch) | |
| tree | b34138ac968663a47cdd2b09a26ea68aeeba2377 /source/blender/python/intern | |
| parent | dc9a7f861fa43fecae7450ee254a711b061c0c26 (diff) | |
| parent | b498db06eb43f1e036f16cb346bf4cbb6d20e6d5 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_view3d/view3d_draw.c
Diffstat (limited to 'source/blender/python/intern')
| -rw-r--r-- | source/blender/python/intern/gpu_offscreen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/intern/gpu_offscreen.c b/source/blender/python/intern/gpu_offscreen.c index 5b4e7da4290..da8e5d69f02 100644 --- a/source/blender/python/intern/gpu_offscreen.c +++ b/source/blender/python/intern/gpu_offscreen.c @@ -203,7 +203,7 @@ static PyObject *pygpu_offscreen_draw_view3d(BPy_GPUOffScreen *self, PyObject *a ARegion *ar; GPUFX *fx; GPUFXSettings fx_settings; - void *rv3d_mats; + struct RV3DMatrixStore *rv3d_mats; BPY_GPU_OFFSCREEN_CHECK_OBJ(self); |