[Bf-blender-cvs] [6b9d73e8a7] master: Cleanup: expose struct for ED_view3d_mats_rv3d_*

[Campbell Barton]

Commit: 6b9d73e8a7de9fa74c76856b564a09a401679a4e
Author: Campbell Barton
Date:   Sat Mar 4 13:32:40 2017 +1100
Branches: master
https://developer.blender.org/rB6b9d73e8a7de9fa74c76856b564a09a401679a4e

Cleanup: expose struct for ED_view3d_mats_rv3d_*

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

M       source/blender/editors/include/ED_view3d.h
M       source/blender/editors/space_view3d/view3d_draw.c
M       source/blender/python/intern/gpu_offscreen.c

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

diff --git a/source/blender/editors/include/ED_view3d.h 
b/source/blender/editors/include/ED_view3d.h
index 79176d9e9c..5514dc0d3d 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -47,6 +47,7 @@ struct Main;
 struct MetaElem;
 struct Nurb;
 struct Object;
+struct RV3DMatrixStore;
 struct RegionView3D;
 struct Scene;
 struct ScrArea;
@@ -330,8 +331,8 @@ void ED_view3d_check_mats_rv3d(struct RegionView3D *rv3d);
 #endif
 int ED_view3d_scene_layer_set(int lay, const int *values, int *active);
 
-void *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d);
-void  ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, void *rv3dmat_pt);
+struct RV3DMatrixStore *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d);
+void                    ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, 
struct RV3DMatrixStore *rv3dmat);
 
 bool ED_view3d_context_activate(struct bContext *C);
 void ED_view3d_draw_offscreen_init(struct Scene *scene, struct View3D *v3d);
diff --git a/source/blender/editors/space_view3d/view3d_draw.c 
b/source/blender/editors/space_view3d/view3d_draw.c
index f23e587e55..0c5cf1bd93 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2955,7 +2955,7 @@ struct RV3DMatrixStore {
        float pixsize;
 };
 
-void *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d)
+struct RV3DMatrixStore *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d)
 {
        struct RV3DMatrixStore *rv3dmat = MEM_mallocN(sizeof(*rv3dmat), 
__func__);
        copy_m4_m4(rv3dmat->winmat, rv3d->winmat);
@@ -2968,9 +2968,8 @@ void *ED_view3d_mats_rv3d_backup(struct RegionView3D 
*rv3d)
        return (void *)rv3dmat;
 }
 
-void ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, void *rv3dmat_pt)
+void ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, struct 
RV3DMatrixStore *rv3dmat)
 {
-       struct RV3DMatrixStore *rv3dmat = rv3dmat_pt;
        copy_m4_m4(rv3d->winmat, rv3dmat->winmat);
        copy_m4_m4(rv3d->viewmat, rv3dmat->viewmat);
        copy_m4_m4(rv3d->persmat, rv3dmat->persmat);
diff --git a/source/blender/python/intern/gpu_offscreen.c 
b/source/blender/python/intern/gpu_offscreen.c
index c4863b2a92..7711ce18bd 100644
--- a/source/blender/python/intern/gpu_offscreen.c
+++ b/source/blender/python/intern/gpu_offscreen.c
@@ -202,7 +202,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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs