Cycles Standalone: Fix building after microdisp changes
authorMai Lavelle <mai.lavelle@gmail.com>
Wed, 10 Aug 2016 18:06:43 +0000 (14:06 -0400)
committerMai Lavelle <mai.lavelle@gmail.com>
Wed, 10 Aug 2016 18:08:13 +0000 (14:08 -0400)
intern/cycles/app/CMakeLists.txt
intern/cycles/app/cycles_xml.cpp

index 73dbf16a3d3d9161cd91d7f66b5a24b435820be3..8cd499b7ca69a1d2ff34297a2f3f98fb48161506 100644 (file)
@@ -88,6 +88,9 @@ macro(cycles_target_link_libraries target)
        if(WITH_CYCLES_OSL)
                target_link_libraries(${target} ${OSL_LIBRARIES} ${LLVM_LIBRARIES})
        endif()
+       if(WITH_CYCLES_OPENSUBDIV)
+               target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
+       endif()
        target_link_libraries(
                ${target}
                ${OPENIMAGEIO_LIBRARIES}
index 3d3aca33881a84f23764476f57d12e89b52f4f33..a54022268bb3a2d396a5866fb33211ce2f28044f 100644 (file)
@@ -57,14 +57,12 @@ struct XMLReadState : public XMLReader {
        Shader *shader;         /* current shader */
        string base;            /* base path to current file*/
        float dicing_rate;      /* current dicing rate */
-       Mesh::DisplacementMethod displacement_method;
 
        XMLReadState()
          : scene(NULL),
            smooth(false),
            shader(NULL),
-           dicing_rate(0.0f),
-           displacement_method(Mesh::DISPLACE_BUMP)
+           dicing_rate(0.0f)
        {
                tfm = transform_identity();
        }
@@ -405,8 +403,6 @@ static void xml_read_mesh(const XMLReadState& state, pugi::xml_node node)
        int shader = 0;
        bool smooth = state.smooth;
 
-       mesh->displacement_method = state.displacement_method;
-
        /* read vertices and polygons, RIB style */
        vector<float3> P;
        vector<float> UV;
@@ -653,14 +649,6 @@ static void xml_read_state(XMLReadState& state, pugi::xml_node node)
                state.smooth = true;
        else if(xml_equal_string(node, "interpolation", "flat"))
                state.smooth = false;
-
-       /* read displacement method */
-       if(xml_equal_string(node, "displacement_method", "true"))
-               state.displacement_method = Mesh::DISPLACE_TRUE;
-       else if(xml_equal_string(node, "displacement_method", "bump"))
-               state.displacement_method = Mesh::DISPLACE_BUMP;
-       else if(xml_equal_string(node, "displacement_method", "both"))
-               state.displacement_method = Mesh::DISPLACE_BOTH;
 }
 
 /* Scene */