blender
/
blender
136
418
Fork 600
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

Geometry Nodes: new repeat zone #109164

Merged
Jacques Lucke merged 98 commits from JacquesLucke/blender:serial-loop into main 2023-07-11 22:36:17 +02:00
Conversation 25 Commits 98 Files Changed 47 -33
4 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ca4b2572a9 - Show all commits

2
source/blender/functions/CMakeLists.txt
View File

@ -20,7 +20,6 @@ set(SRC
intern/lazy_function_execute.cc
intern/lazy_function_graph.cc
intern/lazy_function_graph_executor.cc
intern/lazy_function_serial_loop.cc
intern/multi_function.cc
intern/multi_function_builder.cc
intern/multi_function_params.cc
@ -37,7 +36,6 @@ set(SRC
FN_lazy_function_execute.hh
FN_lazy_function_graph.hh
FN_lazy_function_graph_executor.hh
FN_lazy_function_serial_loop.hh
FN_multi_function.hh
FN_multi_function_builder.hh
FN_multi_function_context.hh

5
source/blender/functions/intern/cpp_types.cc
View File

@ -11,7 +11,6 @@
#include "FN_field_cpp_type_make.hh"
#include "FN_init.h"
#include "FN_lazy_function_serial_loop.hh"
FN_FIELD_CPP_TYPE_MAKE(float);
FN_FIELD_CPP_TYPE_MAKE(blender::float2);
@ -27,8 +26,6 @@ FN_FIELD_CPP_TYPE_MAKE(std::string);
BLI_VECTOR_CPP_TYPE_MAKE(blender::fn::ValueOrField<std::string>);
BLI_CPP_TYPE_MAKE(blender::fn::lazy_function::SerialLoopStatus, CPPTypeFlags::BasicType);
void FN_register_cpp_types()
{
FN_FIELD_CPP_TYPE_REGISTER(float);
@ -44,6 +41,4 @@ void FN_register_cpp_types()
FN_FIELD_CPP_TYPE_REGISTER(std::string);
BLI_VECTOR_CPP_TYPE_REGISTER(blender::fn::ValueOrField<std::string>);
BLI_CPP_TYPE_REGISTER(blender::fn::lazy_function::SerialLoopStatus);
}

25
source/blender/functions/intern/lazy_function_serial_loop.cc
View File

@ -1,25 +0,0 @@
/* SPDX-FileCopyrightText: 2023 Blender Foundation
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "FN_lazy_function_serial_loop.hh"
#include "BLI_utildefines.h"
namespace blender::fn::lazy_function {
std::ostream &operator<<(std::ostream &stream, const SerialLoopStatus status)
{
switch (status) {
case SerialLoopStatus::UsePrevious:
return stream << "UsePrevious";
case SerialLoopStatus::UseCurrent:
return stream << "UseCurrent";
case SerialLoopStatus::Continue:
return stream << "Continue";
}
BLI_assert_unreachable();
return stream;
}
} // namespace blender::fn::lazy_function

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

@ -45,7 +45,6 @@
#include "FN_field_cpp_type.hh"
#include "FN_lazy_function_execute.hh"
#include "FN_lazy_function_graph_executor.hh"
#include "FN_lazy_function_serial_loop.hh"
#include "DEG_depsgraph_query.h"