[Bf-blender-cvs] [b6fe80ca198] master: Fix Cycle standalone build.

[Brecht Van Lommel]

Commit: b6fe80ca1989ab5b1ffa7edb7f7c85b2b03bad03
Author: Brecht Van Lommel
Date:   Fri Mar 2 19:54:14 2018 +0100
Branches: master
https://developer.blender.org/rBb6fe80ca1989ab5b1ffa7edb7f7c85b2b03bad03

Fix Cycle standalone build.

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

M       intern/cycles/app/cycles_xml.cpp
M       intern/cycles/cmake/external_libs.cmake

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

diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 2d6e63468af..21ae07e23b8 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -204,7 +204,7 @@ static void xml_read_camera(XMLReadState& state, xml_node 
node)
        cam->matrix = state.tfm;
 
        cam->need_update = true;
-       cam->update();
+       cam->update(state.scene);
 }
 
 /* Shader */
@@ -515,7 +515,7 @@ static void xml_read_mesh(const XMLReadState& state, 
xml_node node)
                xml_read_float(&sdparams.dicing_rate, node, "dicing_rate");
                sdparams.dicing_rate = std::max(0.1f, sdparams.dicing_rate);
 
-               state.scene->camera->update();
+               state.scene->camera->update(state.scene);
                sdparams.camera = state.scene->camera;
                sdparams.objecttoworld = state.tfm;
        }
diff --git a/intern/cycles/cmake/external_libs.cmake 
b/intern/cycles/cmake/external_libs.cmake
index df88b91f5ac..8d04025e6fd 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -30,7 +30,7 @@ if(NOT CYCLES_STANDALONE_REPOSITORY)
        set(GLEW_INCLUDE_DIR "${GLEW_INCLUDE_PATH}")
 endif()
 
-if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
+if(WITH_CYCLES_STANDALONE)
        set(CYCLES_APP_GLEW_LIBRARY ${BLENDER_GLEW_LIBRARIES})
 endif()

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