diff options
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | intern/cycles/app/io_export_cycles_xml.py | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 689b8bc08e5..554c3c263ae 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -60,6 +60,10 @@ link_directories(${OPENIMAGEIO_LIBPATH} ${TIFF_LIBPATH} ${OPENEXR_LIBPATH}) +if(WITH_OPENCOLORIO) + link_directories(${OPENCOLORIO_LIBPATH}) +endif() + add_definitions(${GL_DEFINITIONS}) include_directories(${INC}) @@ -84,7 +88,6 @@ macro(cycles_target_link_libraries target) target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES}) endif() if(WITH_OPENCOLORIO) - link_directories(${OPENCOLORIO_LIBPATH}) target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES}) endif() target_link_libraries( diff --git a/intern/cycles/app/io_export_cycles_xml.py b/intern/cycles/app/io_export_cycles_xml.py index 816536c0071..437a504d014 100644 --- a/intern/cycles/app/io_export_cycles_xml.py +++ b/intern/cycles/app/io_export_cycles_xml.py @@ -66,8 +66,7 @@ class RenderButtonsPanel(): @classmethod def poll(self, context): - rd = context.scene.render - return rd.engine == 'CYCLES' + return context.engine == 'CYCLES' class PHYSICS_PT_fluid_export(RenderButtonsPanel, bpy.types.Panel): |