blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix Cycle standalone build.

This commit is contained in:
Brecht Van Lommel 2018-03-02 19:54:14 +01:00
parent f76d49ed95
commit b6fe80ca19
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/app/cycles_xml.cpp
View File

@ -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;
}

2
intern/cycles/cmake/external_libs.cmake
View File

@ -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()