From c5519d4b6f7f83bd8dab8491b8615512b65686ac Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 13 Aug 2020 17:39:28 +0200 Subject: [PATCH 1/2] Fix T78065: OSL shader compilation fails on macOS --- build_files/cmake/platform/platform_apple.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index a80b0b56901..2dc724f8376 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -373,8 +373,9 @@ if(WITH_CYCLES_OSL) list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -force_load ${OSL_LIB_EXEC} ${OSL_LIB_QUERY}) find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include) find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin) + find_path(OSL_SHADER_DIR NAMES stdosl.h PATHS ${CYCLES_OSL}/shaders) - if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER) + if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER AND OSL_SHADER_DIR) set(OSL_FOUND TRUE) else() message(STATUS "OSL not found") From a5cf71fa5de503a07e155ba74126b1322d7a10ed Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Thu, 13 Aug 2020 15:38:20 +0200 Subject: [PATCH 2/2] Fix (unreported) sculpt vertex color panel visible for all object types Since DATA_PT_sculpt_vertex_colors has its own poll() we need to call the poll() of MeshButtonsPanel as well Differential Revision: https://developer.blender.org/D8563 --- release/scripts/startup/bl_ui/properties_data_mesh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 7ff2688f2a7..64bc694d5ca 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -468,7 +468,7 @@ class DATA_PT_sculpt_vertex_colors(MeshButtonsPanel, Panel): @classmethod def poll(cls, context): - return context.preferences.experimental.use_sculpt_vertex_colors + return super().poll(context) and context.preferences.experimental.use_sculpt_vertex_colors def draw(self, context): layout = self.layout