diff options
Diffstat (limited to 'source/blender/freestyle/intern/application/Controller.cpp')
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index eb6a4702cba..136fec3dd1c 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -289,14 +289,14 @@ int Controller::LoadMesh(Render *re, SceneRenderLayer *srl) if (_EnableViewMapCache) { NodeCamera *cam; - if (freestyle_proj[3][3] != 0.0) + if (g_freestyle.proj[3][3] != 0.0) cam = new NodeOrthographicCamera; else cam = new NodePerspectiveCamera; double proj[16]; for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { - proj[i * 4 + j] = freestyle_proj[i][j]; + proj[i * 4 + j] = g_freestyle.proj[i][j]; } } cam->setProjectionMatrix(proj); @@ -477,7 +477,7 @@ void Controller::ComputeViewMap() // Restore the context of view: // we need to perform all these operations while the // 3D context is on. - Vec3f vp(freestyle_viewpoint[0], freestyle_viewpoint[1], freestyle_viewpoint[2]); + Vec3f vp(UNPACK3(g_freestyle.viewpoint)); #if 0 if (G.debug & G_DEBUG_FREESTYLE) { @@ -487,7 +487,7 @@ void Controller::ComputeViewMap() real mv[4][4]; for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { - mv[i][j] = freestyle_mv[i][j]; + mv[i][j] = g_freestyle.mv[i][j]; #if 0 if (G.debug & G_DEBUG_FREESTYLE) { cout << mv[i][j] << " "; @@ -509,7 +509,7 @@ void Controller::ComputeViewMap() real proj[4][4]; for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { - proj[i][j] = freestyle_proj[i][j]; + proj[i][j] = g_freestyle.proj[i][j]; #if 0 if (G.debug & G_DEBUG_FREESTYLE) { cout << proj[i][j] << " "; @@ -525,7 +525,7 @@ void Controller::ComputeViewMap() int viewport[4]; for (int i = 0; i < 4; i++) - viewport[i] = freestyle_viewport[i]; + viewport[i] = g_freestyle.viewport[i]; #if 0 if (G.debug & G_DEBUG_FREESTYLE) { |