Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-12-07 15:26:39 +0300
committerJacques Lucke <jacques@blender.org>2021-12-07 15:26:39 +0300
commit0f48b37aae0230119523a9718b331961bd989a78 (patch)
tree3cbbeb57645785ed0be60719dd16392c9cee595a /source/blender/nodes/shader/CMakeLists.txt
parentae5a89e80af78b85877a049d392a84553f2791aa (diff)
Revert moving all shader nodes to c++
This reverts to following commits: * rB5cad004d716da02f511bd34983ac7da820308676 * rB97e3a2d935ba9b21b127eda7ca104d4bcf4e48bd * rBf60b95b5320f8d6abe6a629fe8fc4f1b94d0d91c * rB0bd3cad04edf4bf9b9d3b1353f955534aa5e6740 * rBf72cc47d8edf849af98e196f721022bacf86a5e7 * rB3f7014ecc9d523997062eadd62888af5fc70a2b6 * rB0578921063fbb081239439062215f2538a31af4b * rBc20098e6ec6adee874a12e510aa4a56d89f92838 * rBd5efda72f501ad95679d7ac554086a1fb18c1ac0 The original move to c++ that the other commits depended upon had some issues that should be fixed before committing it again. The issues were reported in T93797, T93809 and T93798. We should also find a better rule for not using c-style casts going forward, although that wouldn't have been reason enough to revert the commits. Introducing something like a `MEM_new<T>` and `MEM_delete<T>` function might help with the the most common case of casting the return type of `MEM_malloc`. Going forward, I recommend first committing the changes that don't require converting files to c++. Then convert the shading node files in smaller chunks. Especially don't mix fairly low risk changes like moving some simple nodes, with higher risk changes.
Diffstat (limited to 'source/blender/nodes/shader/CMakeLists.txt')
-rw-r--r--source/blender/nodes/shader/CMakeLists.txt171
1 files changed, 0 insertions, 171 deletions
diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt
deleted file mode 100644
index bdbdef6e9ec..00000000000
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-# ***** 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
- ../../blenkernel
- ../../blenlib
- ../../blentranslation
- ../../depsgraph
- ../../functions
- ../../gpu
- ../../imbuf
- ../../makesdna
- ../../makesrna
- ../../render
- ../../windowmanager
- ../../../../intern/guardedalloc
- ../../../../intern/sky/include
-)
-
-
-set(SRC
- nodes/node_shader_add_shader.cc
- nodes/node_shader_ambient_occlusion.cc
- nodes/node_shader_attribute.cc
- nodes/node_shader_background.cc
- nodes/node_shader_bevel.cc
- nodes/node_shader_blackbody.cc
- nodes/node_shader_brightness.cc
- nodes/node_shader_bsdf_anisotropic.cc
- nodes/node_shader_bsdf_diffuse.cc
- nodes/node_shader_bsdf_glass.cc
- nodes/node_shader_bsdf_glossy.cc
- nodes/node_shader_bsdf_hair.cc
- nodes/node_shader_bsdf_hair_principled.cc
- nodes/node_shader_bsdf_principled.cc
- nodes/node_shader_bsdf_refraction.cc
- nodes/node_shader_bsdf_toon.cc
- nodes/node_shader_bsdf_translucent.cc
- nodes/node_shader_bsdf_transparent.cc
- nodes/node_shader_bsdf_velvet.cc
- nodes/node_shader_bump.cc
- nodes/node_shader_camera.cc
- nodes/node_shader_clamp.cc
- nodes/node_shader_color_ramp.cc
- nodes/node_shader_combine_hsv.cc
- nodes/node_shader_combine_rgb.cc
- nodes/node_shader_combine_xyz.cc
- nodes/node_shader_common.cc
- nodes/node_shader_curves.cc
- nodes/node_shader_displacement.cc
- nodes/node_shader_eevee_specular.cc
- nodes/node_shader_emission.cc
- nodes/node_shader_fresnel.cc
- nodes/node_shader_gamma.cc
- nodes/node_shader_geometry.cc
- nodes/node_shader_hair_info.cc
- nodes/node_shader_holdout.cc
- nodes/node_shader_hueSatVal.cc
- nodes/node_shader_ies_light.cc
- nodes/node_shader_invert.cc
- nodes/node_shader_layer_weight.cc
- nodes/node_shader_light_falloff.cc
- nodes/node_shader_light_path.cc
- nodes/node_shader_map_range.cc
- nodes/node_shader_mapping.cc
- nodes/node_shader_math.cc
- nodes/node_shader_mix_rgb.cc
- nodes/node_shader_mix_shader.cc
- nodes/node_shader_normal.cc
- nodes/node_shader_normal_map.cc
- nodes/node_shader_object_info.cc
- nodes/node_shader_output_aov.cc
- nodes/node_shader_output_light.cc
- nodes/node_shader_output_linestyle.cc
- nodes/node_shader_output_material.cc
- nodes/node_shader_output_world.cc
- nodes/node_shader_particle_info.cc
- nodes/node_shader_rgb.cc
- nodes/node_shader_rgb_to_bw.cc
- nodes/node_shader_script.cc
- nodes/node_shader_separate_hsv.cc
- nodes/node_shader_separate_rgb.cc
- nodes/node_shader_separate_xyz.cc
- nodes/node_shader_shader_to_rgb.cc
- nodes/node_shader_squeeze.cc
- nodes/node_shader_subsurface_scattering.cc
- nodes/node_shader_tangent.cc
- nodes/node_shader_tex_brick.cc
- nodes/node_shader_tex_checker.cc
- nodes/node_shader_tex_coord.cc
- nodes/node_shader_tex_environment.cc
- nodes/node_shader_tex_gradient.cc
- nodes/node_shader_tex_image.cc
- nodes/node_shader_tex_magic.cc
- nodes/node_shader_tex_musgrave.cc
- nodes/node_shader_tex_noise.cc
- nodes/node_shader_tex_pointdensity.cc
- nodes/node_shader_tex_sky.cc
- nodes/node_shader_tex_voronoi.cc
- nodes/node_shader_tex_wave.cc
- nodes/node_shader_tex_white_noise.cc
- nodes/node_shader_uv_along_stroke.cc
- nodes/node_shader_uvmap.cc
- nodes/node_shader_value.cc
- nodes/node_shader_vector_displacement.cc
- nodes/node_shader_vector_math.cc
- nodes/node_shader_vector_rotate.cc
- nodes/node_shader_vector_transform.cc
- nodes/node_shader_vertex_color.cc
- nodes/node_shader_volume_absorption.cc
- nodes/node_shader_volume_info.cc
- nodes/node_shader_volume_principled.cc
- nodes/node_shader_volume_scatter.cc
- nodes/node_shader_wavelength.cc
- nodes/node_shader_wireframe.cc
-
- node_shader_tree.cc
- node_shader_util.cc
-)
-
-set(LIB
- bf_functions
- bf_intern_sky
-)
-
-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()
-
-if(WITH_FREESTYLE)
- add_definitions(-DWITH_FREESTYLE)
-endif()
-
-blender_add_lib(bf_nodes_shader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-
-if(WITH_UNITY_BUILD)
- set_target_properties(bf_nodes_shader PROPERTIES UNITY_BUILD ON)
- set_target_properties(bf_nodes_shader PROPERTIES UNITY_BUILD_BATCH_SIZE 10)
-endif()