diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 07:31:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:09 +0300 |
| commit | a269287f36cfb99621fc8a5172c050f4a1046ba1 (patch) | |
| tree | 9b7f9016348a94b67fb6300ab6a8c795f64dea65 /source/blender/freestyle/FRS_freestyle.h | |
| parent | 6a393fc9980cd57f6cd183dbe43088d8d816a556 (diff) | |
Cleanup: use single struct for freestyle globals
Was shadowing local vars.
Diffstat (limited to 'source/blender/freestyle/FRS_freestyle.h')
| -rw-r--r-- | source/blender/freestyle/FRS_freestyle.h | 16 |
1 files changed, 11 insertions, 5 deletions
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); |