From a269287f36cfb99621fc8a5172c050f4a1046ba1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 23 Nov 2015 15:31:11 +1100 Subject: Cleanup: use single struct for freestyle globals Was shadowing local vars. --- source/blender/freestyle/FRS_freestyle.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'source/blender/freestyle/FRS_freestyle.h') diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index 975b1212695..039a75a2f0f 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -34,11 +34,17 @@ struct Material; struct FreestyleConfig; struct FreestyleLineStyle; -extern struct Scene *freestyle_scene; -extern float freestyle_viewpoint[3]; -extern float freestyle_mv[4][4]; -extern float freestyle_proj[4][4]; -extern int freestyle_viewport[4]; +struct FreestyleGlobals { + struct Scene *scene; + + /* camera information */ + float viewpoint[3]; + float mv[4][4]; + float proj[4][4]; + int viewport[4]; +}; + +extern struct FreestyleGlobals g_freestyle; /* Rendering */ void FRS_initialize(void); -- cgit v1.2.3