[Bf-blender-cvs] [3f82445d435] functions: windows build fix
Jacques Lucke
noreply at git.blender.org
Thu May 16 10:47:13 CEST 2019
Commit: 3f82445d4351d48066272bbbdb1465179148101b
Author: Jacques Lucke
Date: Thu May 16 10:15:21 2019 +0200
Branches: functions
https://developer.blender.org/rB3f82445d4351d48066272bbbdb1465179148101b
windows build fix
===================================================================
M source/blender/functions/backends/tuple_call/fgraph_tuple_call.cpp
M source/blender/functions/functions/auto_vectorization.cpp
===================================================================
diff --git a/source/blender/functions/backends/tuple_call/fgraph_tuple_call.cpp b/source/blender/functions/backends/tuple_call/fgraph_tuple_call.cpp
index 28454ea76a5..70324626d45 100644
--- a/source/blender/functions/backends/tuple_call/fgraph_tuple_call.cpp
+++ b/source/blender/functions/backends/tuple_call/fgraph_tuple_call.cpp
@@ -439,7 +439,7 @@ class ExecuteFGraph : public TupleCallBody {
SocketInfo &output_info = m_output_info[output_id];
CPPTypeInfo *type_info = output_info.type;
- uint *target_ids = BLI_array_alloca(target_ids, possible_target_ids.size());
+ uint *target_ids = (uint *)BLI_array_alloca(target_ids, possible_target_ids.size());
uint target_amount = this->filter_uninitialized_targets(
possible_target_ids, storage, target_ids);
diff --git a/source/blender/functions/functions/auto_vectorization.cpp b/source/blender/functions/functions/auto_vectorization.cpp
index 89e2f4b3ba7..4b32c4a41c2 100644
--- a/source/blender/functions/functions/auto_vectorization.cpp
+++ b/source/blender/functions/functions/auto_vectorization.cpp
@@ -287,7 +287,7 @@ class AutoVectorization : public TupleCallBody {
void call(Tuple &fn_in, Tuple &fn_out, ExecutionContext &ctx) const override
{
- uint *input_lengths = BLI_array_alloca(input_lengths, m_list_inputs.size());
+ uint *input_lengths = (uint *)BLI_array_alloca(input_lengths, m_list_inputs.size());
this->get_input_list_lengths(fn_in, ctx, input_lengths);
uint max_length = *std::max_element(input_lengths, input_lengths + m_list_inputs.size());
More information about the Bf-blender-cvs
mailing list