diff options
author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2022-01-06 05:08:32 +0300 |
---|---|---|
committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2022-01-07 02:21:01 +0300 |
commit | e6ca0b33e9209f11dff9c5109f21a8b3678e8a0c (patch) | |
tree | 89dfa5877d47c42a388d504cf89c155991ce3b16 /source/blender/nodes | |
parent | ed9b21098dd27bf9364397357f89b4c2648f40c2 (diff) |
Cleanup: Add `bf_nodes_texture` library
For sake of consistencey with other node tree types, create its own cmake module.
This change helps keep `bf_nodes` focused on generic nodes files.
Texture nodes are end of life and hopefully for Blender 4.0 they can be removed.
It is not expected that these will see the updates that the other nodes are getting.
This change also helps isolate the end of life files, we may move some texture
specific node tree execution code out of `node_exec` and into a `node_texture_exec` files.
Differential Revision: https://developer.blender.org/D13743
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 30 | ||||
-rw-r--r-- | source/blender/nodes/texture/CMakeLists.txt | 89 |
2 files changed, 91 insertions, 28 deletions
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index e210958fa5d..f965302be5e 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -22,6 +22,7 @@ add_subdirectory(composite) add_subdirectory(function) add_subdirectory(geometry) add_subdirectory(shader) +add_subdirectory(texture) set(INC . @@ -51,32 +52,6 @@ set(INC set(SRC - texture/nodes/node_texture_at.c - texture/nodes/node_texture_bricks.c - texture/nodes/node_texture_checker.c - texture/nodes/node_texture_common.c - texture/nodes/node_texture_compose.c - texture/nodes/node_texture_coord.c - texture/nodes/node_texture_curves.c - texture/nodes/node_texture_decompose.c - texture/nodes/node_texture_distance.c - texture/nodes/node_texture_hueSatVal.c - texture/nodes/node_texture_image.c - texture/nodes/node_texture_invert.c - texture/nodes/node_texture_math.c - texture/nodes/node_texture_mixRgb.c - texture/nodes/node_texture_output.c - texture/nodes/node_texture_proc.c - texture/nodes/node_texture_rotate.c - texture/nodes/node_texture_scale.c - texture/nodes/node_texture_texture.c - texture/nodes/node_texture_translate.c - texture/nodes/node_texture_valToNor.c - texture/nodes/node_texture_valToRgb.c - texture/nodes/node_texture_viewer.c - texture/node_texture_tree.c - texture/node_texture_util.c - intern/derived_node_tree.cc intern/geometry_nodes_eval_log.cc intern/math_functions.cc @@ -91,8 +66,6 @@ set(SRC intern/node_util.c intern/socket_search_link.cc - texture/node_texture_util.h - NOD_common.h NOD_composite.h NOD_derived_node_tree.hh @@ -123,6 +96,7 @@ set(LIB bf_nodes_function bf_nodes_geometry bf_nodes_shader + bf_nodes_texture ) if(WITH_BULLET) diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt new file mode 100644 index 00000000000..053b17e4e57 --- /dev/null +++ b/source/blender/nodes/texture/CMakeLists.txt @@ -0,0 +1,89 @@ +# ***** 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. +# +# ***** END GPL LICENSE BLOCK ***** + +set(INC + . + ../ + ../intern + ../../editors/include + ../../blenkernel + ../../blenlib + ../../blentranslation + ../../depsgraph + ../../imbuf + ../../makesdna + ../../makesrna + ../../render + ../../windowmanager + ../../../../intern/guardedalloc +) + + +set(SRC + nodes/node_texture_at.c + nodes/node_texture_bricks.c + nodes/node_texture_checker.c + nodes/node_texture_common.c + nodes/node_texture_compose.c + nodes/node_texture_coord.c + nodes/node_texture_curves.c + nodes/node_texture_decompose.c + nodes/node_texture_distance.c + nodes/node_texture_hueSatVal.c + nodes/node_texture_image.c + nodes/node_texture_invert.c + nodes/node_texture_math.c + nodes/node_texture_mixRgb.c + nodes/node_texture_output.c + nodes/node_texture_proc.c + nodes/node_texture_rotate.c + nodes/node_texture_scale.c + nodes/node_texture_texture.c + nodes/node_texture_translate.c + nodes/node_texture_valToNor.c + nodes/node_texture_valToRgb.c + nodes/node_texture_viewer.c + node_texture_tree.c + node_texture_util.c + + node_texture_util.h +) + +set(LIB + bf_nodes +) + +if(WITH_PYTHON) + list(APPEND INC + ../../python + ) + list(APPEND INC_SYS + ${PYTHON_INCLUDE_DIRS} + ) + list(APPEND LIB + ${PYTHON_LINKFLAGS} + ${PYTHON_LIBRARIES} + ) + add_definitions(-DWITH_PYTHON) +endif() + +if(WITH_INTERNATIONAL) + add_definitions(-DWITH_INTERNATIONAL) +endif() + +blender_add_lib(bf_nodes_texture "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") |