blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'blender-v3.3-release'

This commit is contained in:
Xavier Hallade 2022-08-07 23:08:34 +02:00
parent 341e9f7a7c e4938b163e
commit 387e7e9e8d
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/CMakeLists.txt
View File

@ -749,10 +749,8 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
if (NOT DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen)
SET (CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "${CYCLES_ONEAPI_SYCL_OPTIONS_spir64}" CACHE STRING "Extra build options for spir64_gen target")
endif()
# enabling zebin (graphics binary format with improved compatibility) on Windows only while support on Linux isn't available yet
if(WIN32)
string(PREPEND CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "--format zebin ")
endif()
# Enable zebin, a graphics binary format with improved compatibility.
string(PREPEND CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "--format zebin ")
string(PREPEND CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "-device ${CYCLES_ONEAPI_SPIR64_GEN_DEVICES} ")
if (WITH_CYCLES_ONEAPI_BINARIES)

7
source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_selection.cc
View File

@ -110,7 +110,12 @@ class PathToEdgeSelectionFieldInput final : public GeometryFieldInput {
bool is_equal_to(const fn::FieldNode &other) const override
{
return dynamic_cast<const PathToEdgeSelectionFieldInput *>(&other) != nullptr;
if (const PathToEdgeSelectionFieldInput *other_field =
dynamic_cast<const PathToEdgeSelectionFieldInput *>(&other)) {
return other_field->start_vertices_ == start_vertices_ &&
other_field->next_vertex_ == next_vertex_;
}
return false;
}
};

12
source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc
View File

@ -148,7 +148,11 @@ class ShortestEdgePathsNextVertFieldInput final : public GeometryFieldInput {
bool is_equal_to(const fn::FieldNode &other) const override
{
return dynamic_cast<const ShortestEdgePathsNextVertFieldInput *>(&other) != nullptr;
if (const ShortestEdgePathsNextVertFieldInput *other_field =
dynamic_cast<const ShortestEdgePathsNextVertFieldInput *>(&other)) {
return other_field->end_selection_ == end_selection_ && other_field->cost_ == cost_;
}
return false;
}
};
@ -215,7 +219,11 @@ class ShortestEdgePathsCostFieldInput final : public GeometryFieldInput {
bool is_equal_to(const fn::FieldNode &other) const override
{
return dynamic_cast<const ShortestEdgePathsCostFieldInput *>(&other) != nullptr;
if (const ShortestEdgePathsCostFieldInput *other_field =
dynamic_cast<const ShortestEdgePathsCostFieldInput *>(&other)) {
return other_field->end_selection_ == end_selection_ && other_field->cost_ == cost_;
}
return false;
}
};