griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: compilation with clang on linux

Browse Source
This commit is contained in:
Jacques Lucke
2024-07-10 17:47:26 +02:00
parent d0ebd8e1a7
commit 9816dba416
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/nodes/NOD_value_elem.hh
View File

@@ -110,7 +110,7 @@ struct VectorElem {
static VectorElem all()
{
return {true, true, true};
return {{true}, {true}, {true}};
}
};
@@ -152,7 +152,7 @@ struct RotationElem {
static RotationElem all()
{
return {VectorElem::all(), VectorElem::all(), true};
return {VectorElem::all(), VectorElem::all(), {true}};
}
};

2
source/blender/nodes/function/nodes/node_fn_combine_matrix.cc
View File

@@ -180,7 +180,7 @@ static void node_eval_elem(value_elem::ElemEvalParams &params)
matrix_elem.scale = VectorElem::all();
}
const bool any_non_transform = input_elems[0][3] | input_elems[1][3] | input_elems[2][3] |
const bool any_non_transform = input_elems[0][3] || input_elems[1][3] || input_elems[2][3] ||
input_elems[3][3];
if (any_non_transform) {
matrix_elem.any_non_transform = FloatElem::all();

2
source/blender/nodes/function/nodes/node_fn_separate_matrix.cc
View File

@@ -251,7 +251,7 @@ static void node_eval_inverse_elem(value_elem::InverseElemEvalParams &params)
matrix_elem.scale = VectorElem::all();
}
const bool any_non_transform = output_elems[0][3] | output_elems[1][3] | output_elems[2][3] |
const bool any_non_transform = output_elems[0][3] || output_elems[1][3] || output_elems[2][3] ||
output_elems[3][3];
if (any_non_transform) {
matrix_elem.any_non_transform = FloatElem::all();

3
source/blender/nodes/intern/geometry_nodes_lazy_function.cc
View File

@@ -979,12 +979,11 @@ class LazyFunctionForGizmoNode : public LazyFunction {
class LazyFunctionForGizmoInputsUsage : public LazyFunction {
private:
const bNode *gizmo_node_;
const lf::FunctionNode *lf_gizmo_node_ = nullptr;
public:
LazyFunctionForGizmoInputsUsage(const bNode &gizmo_node, const lf::FunctionNode &lf_gizmo_node)
: gizmo_node_(&gizmo_node), lf_gizmo_node_(&lf_gizmo_node)
: lf_gizmo_node_(&lf_gizmo_node)
{
debug_name_ = gizmo_node.name;
outputs_.append_as("Need Inputs", CPPType::get<bool>());

9
source/blender/nodes/intern/geometry_nodes_log.cc
View File

@@ -122,17 +122,16 @@ GeometryInfoLog::GeometryInfoLog(const bke::GeometrySet &geometry_set)
case bke::GeometryComponent::Type::Edit: {
const auto &edit_component = *static_cast<const bke::GeometryComponentEditData *>(
component);
if (!this->edit_data_info) {
this->edit_data_info.emplace(EditDataInfo());
}
EditDataInfo &info = *this->edit_data_info;
if (const bke::CurvesEditHints *curve_edit_hints = edit_component.curves_edit_hints_.get())
{
EditDataInfo &info = this->edit_data_info.emplace();
info.has_deform_matrices = curve_edit_hints->deform_mats.has_value();
info.has_deformed_positions = curve_edit_hints->positions().has_value();
}
if (const bke::GizmoEditHints *gizmo_edit_hints = edit_component.gizmo_edit_hints_.get()) {
if (!this->edit_data_info) {
this->edit_data_info.emplace();
}
EditDataInfo &info = this->edit_data_info.emplace();
info.gizmo_transforms_num = gizmo_edit_hints->gizmo_transforms.size();
}
break;

6
source/blender/nodes/shader/nodes/node_shader_vector_math.cc
View File

@@ -321,7 +321,7 @@ static void sh_node_vector_math_build_multi_function(NodeMultiFunctionBuilder &b
static void node_eval_elem(value_elem::ElemEvalParams &params)
{
using namespace value_elem;
const NodeMathOperation op = NodeMathOperation(params.node.custom1);
const NodeVectorMathOperation op = NodeVectorMathOperation(params.node.custom1);
switch (op) {
case NODE_VECTOR_MATH_ADD:
case NODE_VECTOR_MATH_SUBTRACT:
@@ -348,7 +348,7 @@ static void node_eval_elem(value_elem::ElemEvalParams &params)
static void node_eval_inverse_elem(value_elem::InverseElemEvalParams &params)
{
const NodeMathOperation op = NodeMathOperation(params.node.custom1);
const NodeVectorMathOperation op = NodeVectorMathOperation(params.node.custom1);
switch (op) {
case NODE_VECTOR_MATH_ADD:
case NODE_VECTOR_MATH_SUBTRACT:
@@ -365,7 +365,7 @@ static void node_eval_inverse_elem(value_elem::InverseElemEvalParams &params)
static void node_eval_inverse(inverse_eval::InverseEvalParams &params)
{
const NodeMathOperation op = NodeMathOperation(params.node.custom1);
const NodeVectorMathOperation op = NodeVectorMathOperation(params.node.custom1);
const StringRef first_input_id = "Vector";
const StringRef second_input_id = "Vector_001";
const StringRef scale_input_id = "Scale";