forked from bartvdbraak/blender
Fix build error on macOS after recent changes
This commit is contained in:
parent
e58ec74046
commit
1767a7c986
@ -391,7 +391,7 @@ macro(cycles_target_link_libraries target)
|
|||||||
target_link_libraries(${target} bf_intern_numaapi)
|
target_link_libraries(${target} bf_intern_numaapi)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX AND NOT APPLE)
|
||||||
if(CYCLES_STANDALONE_REPOSITORY)
|
if(CYCLES_STANDALONE_REPOSITORY)
|
||||||
target_link_libraries(${target} extern_libc_compat)
|
target_link_libraries(${target} extern_libc_compat)
|
||||||
else()
|
else()
|
||||||
|
@ -419,8 +419,8 @@ TEST_F(RenderGraph, constant_fold_mix_add)
|
|||||||
.set(&MixNode::type, NODE_MIX_ADD)
|
.set(&MixNode::type, NODE_MIX_ADD)
|
||||||
.set(&MixNode::use_clamp, false)
|
.set(&MixNode::use_clamp, false)
|
||||||
.set("Fac", 0.8f)
|
.set("Fac", 0.8f)
|
||||||
.set("Color1", make_float3(0.3, 0.5, 0.7))
|
.set("Color1", make_float3(0.3f, 0.5f, 0.7f))
|
||||||
.set("Color2", make_float3(0.4, 0.8, 0.9)))
|
.set("Color2", make_float3(0.4f, 0.8f, 0.9f)))
|
||||||
.output_color("MixAdd::Color");
|
.output_color("MixAdd::Color");
|
||||||
|
|
||||||
graph.finalize(scene);
|
graph.finalize(scene);
|
||||||
@ -440,8 +440,8 @@ TEST_F(RenderGraph, constant_fold_mix_add_clamp)
|
|||||||
.set(&MixNode::type, NODE_MIX_ADD)
|
.set(&MixNode::type, NODE_MIX_ADD)
|
||||||
.set(&MixNode::use_clamp, true)
|
.set(&MixNode::use_clamp, true)
|
||||||
.set("Fac", 0.8f)
|
.set("Fac", 0.8f)
|
||||||
.set("Color1", make_float3(0.3, 0.5, 0.7))
|
.set("Color1", make_float3(0.3f, 0.5f, 0.7f))
|
||||||
.set("Color2", make_float3(0.4, 0.8, 0.9)))
|
.set("Color2", make_float3(0.4f, 0.8f, 0.9f)))
|
||||||
.output_color("MixAdd::Color");
|
.output_color("MixAdd::Color");
|
||||||
|
|
||||||
graph.finalize(scene);
|
graph.finalize(scene);
|
||||||
|
Loading…
Reference in New Issue
Block a user