Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.90-release'

Browse Source
This commit is contained in:
Philipp Oeser
2020-08-14 10:40:57 +02:00
parent d0c0a2e392 a5cf71fa5d
commit 24f7f33c25
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build_files/cmake/platform/platform_apple.cmake
View File

@@ -373,8 +373,9 @@ if(WITH_CYCLES_OSL)
list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -force_load ${OSL_LIB_EXEC} ${OSL_LIB_QUERY}) 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_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin) 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) set(OSL_FOUND TRUE)
else() else()
message(STATUS "OSL not found") message(STATUS "OSL not found")

2
release/scripts/startup/bl_ui/properties_data_mesh.py
View File

@@ -468,7 +468,7 @@ class DATA_PT_sculpt_vertex_colors(MeshButtonsPanel, Panel):
@classmethod @classmethod
def poll(cls, context): 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): def draw(self, context):
layout = self.layout layout = self.layout