[Bf-blender-cvs] [1e9175e1d71] master: Nodes: Add bf_nodes_function module

Aaron Carlisle noreply at git.blender.org
Tue Dec 28 21:18:25 CET 2021


Commit: 1e9175e1d714f56566a007eab5ddbb2812e89b97
Author: Aaron Carlisle
Date:   Tue Dec 28 15:17:53 2021 -0500
Branches: master
https://developer.blender.org/rB1e9175e1d714f56566a007eab5ddbb2812e89b97

Nodes: Add bf_nodes_function module

In the future this will be used to support unity builds for function nodes

Differential Revision: https://developer.blender.org/D13682

===================================================================

M	source/blender/nodes/CMakeLists.txt
A	source/blender/nodes/function/CMakeLists.txt

===================================================================

diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index b3318685e4c..4d31cd3e4f5 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -19,6 +19,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 add_subdirectory(composite)
+add_subdirectory(function)
 add_subdirectory(geometry)
 add_subdirectory(shader)
 
@@ -50,26 +51,6 @@ set(INC
 
 
 set(SRC
-  function/nodes/legacy/node_fn_random_float.cc
-
-  function/nodes/node_fn_align_euler_to_vector.cc
-  function/nodes/node_fn_boolean_math.cc
-  function/nodes/node_fn_compare.cc
-  function/nodes/node_fn_float_to_int.cc
-  function/nodes/node_fn_input_bool.cc
-  function/nodes/node_fn_input_color.cc
-  function/nodes/node_fn_input_int.cc
-  function/nodes/node_fn_input_special_characters.cc
-  function/nodes/node_fn_input_string.cc
-  function/nodes/node_fn_input_vector.cc
-  function/nodes/node_fn_random_value.cc
-  function/nodes/node_fn_replace_string.cc
-  function/nodes/node_fn_rotate_euler.cc
-  function/nodes/node_fn_slice_string.cc
-  function/nodes/node_fn_string_length.cc
-  function/nodes/node_fn_value_to_string.cc
-  function/node_function_util.cc
-
   texture/nodes/node_texture_at.c
   texture/nodes/node_texture_bricks.c
   texture/nodes/node_texture_checker.c
@@ -110,7 +91,6 @@ set(SRC
   intern/node_tree_ref.cc
   intern/node_util.c
 
-  function/node_function_util.hh
   texture/node_texture_util.h
 
   NOD_common.h
@@ -140,6 +120,7 @@ set(LIB
   bf_bmesh
   bf_functions
   bf_nodes_composite
+  bf_nodes_function
   bf_nodes_geometry
   bf_nodes_shader
 )
diff --git a/source/blender/nodes/function/CMakeLists.txt b/source/blender/nodes/function/CMakeLists.txt
new file mode 100644
index 00000000000..705d426a3ec
--- /dev/null
+++ b/source/blender/nodes/function/CMakeLists.txt
@@ -0,0 +1,70 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2021, Blender Foundation
+# All rights reserved.
+# ***** END GPL LICENSE BLOCK *****
+
+set(INC
+  .
+  ../
+  ../intern
+  ../../blenkernel
+  ../../blenlib
+  ../../blentranslation
+  ../../editors/include
+  ../../functions
+  ../../makesdna
+  ../../makesrna
+  ../../windowmanager
+  ../../../../intern/guardedalloc
+)
+
+
+set(SRC
+  nodes/legacy/node_fn_random_float.cc
+
+  nodes/node_fn_align_euler_to_vector.cc
+  nodes/node_fn_boolean_math.cc
+  nodes/node_fn_compare.cc
+  nodes/node_fn_float_to_int.cc
+  nodes/node_fn_input_bool.cc
+  nodes/node_fn_input_color.cc
+  nodes/node_fn_input_int.cc
+  nodes/node_fn_input_special_characters.cc
+  nodes/node_fn_input_string.cc
+  nodes/node_fn_input_vector.cc
+  nodes/node_fn_random_value.cc
+  nodes/node_fn_replace_string.cc
+  nodes/node_fn_rotate_euler.cc
+  nodes/node_fn_slice_string.cc
+  nodes/node_fn_string_length.cc
+  nodes/node_fn_value_to_string.cc
+  
+  node_function_util.cc
+
+  node_function_util.hh
+)
+
+set(LIB
+  bf_functions
+)
+
+if(WITH_INTERNATIONAL)
+  add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
+blender_add_lib(bf_nodes_function "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")



More information about the Bf-blender-cvs mailing list