2008-01-07 19:13:47 +00:00
|
|
|
# ***** BEGIN GPL LICENSE BLOCK *****
|
2007-03-27 18:34:57 +00:00
|
|
|
#
|
|
|
|
# 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
|
2008-01-07 19:13:47 +00:00
|
|
|
# of the License, or (at your option) any later version.
|
2007-03-27 18:34:57 +00:00
|
|
|
#
|
|
|
|
# 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,
|
2010-02-12 13:34:04 +00:00
|
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2007-03-27 18:34:57 +00:00
|
|
|
#
|
|
|
|
# The Original Code is Copyright (C) 2006, Blender Foundation
|
|
|
|
# All rights reserved.
|
2008-01-07 19:13:47 +00:00
|
|
|
# ***** END GPL LICENSE BLOCK *****
|
2007-03-27 18:34:57 +00:00
|
|
|
|
2012-10-24 08:36:10 +00:00
|
|
|
set(INC
|
2010-09-06 10:15:41 +00:00
|
|
|
.
|
2012-10-17 04:13:03 +00:00
|
|
|
composite
|
2020-04-20 15:27:12 +02:00
|
|
|
function
|
2020-12-11 15:00:22 +11:00
|
|
|
geometry
|
2012-10-17 04:13:03 +00:00
|
|
|
intern
|
|
|
|
shader
|
|
|
|
texture
|
2021-02-08 15:09:49 -06:00
|
|
|
../editors/include
|
2010-09-06 10:15:41 +00:00
|
|
|
../blenkernel
|
|
|
|
../blenlib
|
2015-08-16 17:32:01 +10:00
|
|
|
../blentranslation
|
2020-12-02 13:25:25 +01:00
|
|
|
../bmesh
|
2018-02-06 17:28:00 +11:00
|
|
|
../depsgraph
|
2020-07-07 18:23:33 +02:00
|
|
|
../functions
|
2010-09-06 10:15:41 +00:00
|
|
|
../gpu
|
|
|
|
../imbuf
|
|
|
|
../makesdna
|
|
|
|
../makesrna
|
2020-11-06 10:10:18 -05:00
|
|
|
../render
|
2014-10-07 15:46:19 -05:00
|
|
|
../../../intern/glew-mx
|
2019-04-24 14:39:31 +10:00
|
|
|
../../../intern/guardedalloc
|
2020-07-09 17:19:52 +02:00
|
|
|
../../../intern/sky/include
|
2011-05-31 01:15:44 +00:00
|
|
|
)
|
|
|
|
|
2007-03-27 18:34:57 +00:00
|
|
|
|
2010-10-23 04:05:55 +00:00
|
|
|
set(SRC
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_alphaOver.c
|
|
|
|
composite/nodes/node_composite_bilateralblur.c
|
|
|
|
composite/nodes/node_composite_blur.c
|
2019-01-25 08:30:33 +11:00
|
|
|
composite/nodes/node_composite_bokehblur.c
|
|
|
|
composite/nodes/node_composite_bokehimage.c
|
|
|
|
composite/nodes/node_composite_boxmask.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_brightness.c
|
|
|
|
composite/nodes/node_composite_channelMatte.c
|
|
|
|
composite/nodes/node_composite_chromaMatte.c
|
|
|
|
composite/nodes/node_composite_colorMatte.c
|
|
|
|
composite/nodes/node_composite_colorSpill.c
|
|
|
|
composite/nodes/node_composite_colorbalance.c
|
2019-01-25 08:30:33 +11:00
|
|
|
composite/nodes/node_composite_colorcorrection.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_common.c
|
|
|
|
composite/nodes/node_composite_composite.c
|
2014-03-11 14:07:49 +01:00
|
|
|
composite/nodes/node_composite_cornerpin.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_crop.c
|
2018-07-18 13:03:09 +02:00
|
|
|
composite/nodes/node_composite_cryptomatte.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_curves.c
|
|
|
|
composite/nodes/node_composite_defocus.c
|
Compositor: Added denoising node
This node is built on Intel's OpenImageDenoise library.
Other denoisers could be integrated, for example Lukas' Cycles denoiser.
Compositor: Made OpenImageDenoise optional, added CMake and build_env files to find OIDN
Compositor: Fixed some warnings in the denoising operator
build_environment: Updated OpenImageDenoise to 0.8.1
build_environment: Updated OpenImageDenoise in `make deps` for macOS
Reviewers: sergey, jbakker, brecht
Reviewed By: brecht
Subscribers: YAFU, LazyDodo, Zen_YS, slumber, samgreen, tjvoll, yeus, ponomarovmax, getrad, coder.kalyan, vitos1k, Yegor, DeepBlender, kumaran7, Darkfie9825, aliasguru, aafra, ace_dragon, juang3d, pandrodor, cdog, lordodin, jtheninja, mavek, marcog, 5k1n2, Atair, rawalanche, 0o00o0oo, filibis, poor, lukasstockner97
Tags: #compositing
Differential Revision: https://developer.blender.org/D4304
2019-08-14 15:30:26 +02:00
|
|
|
composite/nodes/node_composite_denoise.c
|
2019-01-25 08:30:33 +11:00
|
|
|
composite/nodes/node_composite_despeckle.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_diffMatte.c
|
|
|
|
composite/nodes/node_composite_dilate.c
|
|
|
|
composite/nodes/node_composite_directionalblur.c
|
|
|
|
composite/nodes/node_composite_displace.c
|
|
|
|
composite/nodes/node_composite_distanceMatte.c
|
2019-01-25 08:30:33 +11:00
|
|
|
composite/nodes/node_composite_doubleEdgeMask.c
|
|
|
|
composite/nodes/node_composite_ellipsemask.c
|
2020-12-19 14:40:31 -05:00
|
|
|
composite/nodes/node_composite_exposure.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_filter.c
|
|
|
|
composite/nodes/node_composite_flip.c
|
|
|
|
composite/nodes/node_composite_gamma.c
|
|
|
|
composite/nodes/node_composite_glare.c
|
|
|
|
composite/nodes/node_composite_hueSatVal.c
|
|
|
|
composite/nodes/node_composite_huecorrect.c
|
|
|
|
composite/nodes/node_composite_idMask.c
|
|
|
|
composite/nodes/node_composite_image.c
|
2012-08-06 13:45:11 +00:00
|
|
|
composite/nodes/node_composite_inpaint.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_invert.c
|
2012-06-14 12:19:13 +00:00
|
|
|
composite/nodes/node_composite_keying.c
|
2019-01-25 08:30:33 +11:00
|
|
|
composite/nodes/node_composite_keyingscreen.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_lensdist.c
|
|
|
|
composite/nodes/node_composite_levels.c
|
|
|
|
composite/nodes/node_composite_lummaMatte.c
|
2019-01-25 08:30:33 +11:00
|
|
|
composite/nodes/node_composite_mapRange.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_mapUV.c
|
|
|
|
composite/nodes/node_composite_mapValue.c
|
2012-06-04 16:42:58 +00:00
|
|
|
composite/nodes/node_composite_mask.c
|
2019-01-25 08:30:33 +11:00
|
|
|
composite/nodes/node_composite_math.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_mixrgb.c
|
2011-11-07 12:56:05 +00:00
|
|
|
composite/nodes/node_composite_movieclip.c
|
|
|
|
composite/nodes/node_composite_moviedistortion.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_normal.c
|
|
|
|
composite/nodes/node_composite_normalize.c
|
|
|
|
composite/nodes/node_composite_outputFile.c
|
2019-01-25 08:30:33 +11:00
|
|
|
composite/nodes/node_composite_pixelate.c
|
Merge plane track feature from tomato branch
This commit includes all the changes made for plane tracker
in tomato branch.
Movie clip editor changes:
- Artist might create a plane track out of multiple point
tracks which belongs to the same track (minimum amount of
point tracks is 4, maximum is not actually limited).
When new plane track is added, it's getting "tracked"
across all point tracks, which makes it stick to the same
plane point tracks belong to.
- After plane track was added, it need to be manually adjusted
in a way it covers feature one might to mask/replace.
General transform tools (G, R, S) or sliding corners with
a mouse could be sued for this. Plane corner which
corresponds to left bottom image corner has got X/Y axis
on it (red is for X axis, green for Y).
- Re-adjusting plane corners makes plane to be "re-tracked"
for the frames sequence between current frame and next
and previous keyframes.
- Kayframes might be removed from the plane, using Shit-X
(Marker Delete) operator. However, currently manual
re-adjustment or "re-track" trigger is needed.
Compositor changes:
- Added new node called Plane Track Deform.
- User selects which plane track to use (for this he need
to select movie clip datablock, object and track names).
- Node gets an image input, which need to be warped into
the plane.
- Node outputs:
* Input image warped into the plane.
* Plane, rasterized to a mask.
Masking changes:
- Mask points might be parented to a plane track, which
makes this point deforming in a way as if it belongs
to the tracked plane.
Some video tutorials are available:
- Coder video: http://www.youtube.com/watch?v=vISEwqNHqe4
- Artist video: https://vimeo.com/71727578
This is mine and Keir's holiday code project :)
2013-08-16 09:46:30 +00:00
|
|
|
composite/nodes/node_composite_planetrackdeform.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_premulkey.c
|
|
|
|
composite/nodes/node_composite_rgb.c
|
|
|
|
composite/nodes/node_composite_rotate.c
|
|
|
|
composite/nodes/node_composite_scale.c
|
|
|
|
composite/nodes/node_composite_sepcombHSVA.c
|
|
|
|
composite/nodes/node_composite_sepcombRGBA.c
|
|
|
|
composite/nodes/node_composite_sepcombYCCA.c
|
|
|
|
composite/nodes/node_composite_sepcombYUVA.c
|
|
|
|
composite/nodes/node_composite_setalpha.c
|
|
|
|
composite/nodes/node_composite_splitViewer.c
|
2011-11-07 12:56:05 +00:00
|
|
|
composite/nodes/node_composite_stabilize2d.c
|
2014-07-26 12:59:29 +02:00
|
|
|
composite/nodes/node_composite_sunbeams.c
|
2019-01-25 08:30:33 +11:00
|
|
|
composite/nodes/node_composite_switch.c
|
|
|
|
composite/nodes/node_composite_switchview.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_texture.c
|
|
|
|
composite/nodes/node_composite_tonemap.c
|
2012-06-19 17:29:58 +00:00
|
|
|
composite/nodes/node_composite_trackpos.c
|
2011-11-07 12:56:05 +00:00
|
|
|
composite/nodes/node_composite_transform.c
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/nodes/node_composite_translate.c
|
|
|
|
composite/nodes/node_composite_valToRgb.c
|
|
|
|
composite/nodes/node_composite_value.c
|
|
|
|
composite/nodes/node_composite_vecBlur.c
|
|
|
|
composite/nodes/node_composite_viewer.c
|
|
|
|
composite/nodes/node_composite_zcombine.c
|
2012-10-24 08:36:10 +00:00
|
|
|
|
2011-09-05 21:01:50 +00:00
|
|
|
composite/node_composite_tree.c
|
2013-03-18 16:34:57 +00:00
|
|
|
composite/node_composite_util.c
|
2011-09-05 21:01:50 +00:00
|
|
|
|
2020-04-20 15:27:12 +02:00
|
|
|
function/nodes/node_fn_boolean_math.cc
|
2020-05-04 12:49:25 +02:00
|
|
|
function/nodes/node_fn_combine_strings.cc
|
2020-04-20 15:27:12 +02:00
|
|
|
function/nodes/node_fn_float_compare.cc
|
2020-05-04 12:49:25 +02:00
|
|
|
function/nodes/node_fn_group_instance_id.cc
|
2021-02-19 16:03:14 -06:00
|
|
|
function/nodes/node_fn_input_string.cc
|
2020-12-17 18:37:04 +01:00
|
|
|
function/nodes/node_fn_input_vector.cc
|
2020-07-21 17:20:05 +02:00
|
|
|
function/nodes/node_fn_object_transforms.cc
|
2020-08-02 22:04:24 +02:00
|
|
|
function/nodes/node_fn_random_float.cc
|
2020-04-20 15:27:12 +02:00
|
|
|
function/nodes/node_fn_switch.cc
|
|
|
|
function/node_function_util.cc
|
|
|
|
|
2021-01-12 12:55:14 +01:00
|
|
|
geometry/nodes/node_geo_align_rotation_to_vector.cc
|
2020-12-17 11:55:45 +01:00
|
|
|
geometry/nodes/node_geo_attribute_color_ramp.cc
|
2021-02-09 11:12:24 -06:00
|
|
|
geometry/nodes/node_geo_attribute_combine_xyz.cc
|
2020-12-17 12:22:47 -06:00
|
|
|
geometry/nodes/node_geo_attribute_compare.cc
|
2020-12-10 07:58:45 -06:00
|
|
|
geometry/nodes/node_geo_attribute_fill.cc
|
2020-12-02 13:25:25 +01:00
|
|
|
geometry/nodes/node_geo_attribute_math.cc
|
2021-01-04 13:16:17 +11:00
|
|
|
geometry/nodes/node_geo_attribute_mix.cc
|
2021-02-05 08:28:31 -06:00
|
|
|
geometry/nodes/node_geo_attribute_proximity.cc
|
2020-12-16 13:31:56 +01:00
|
|
|
geometry/nodes/node_geo_attribute_randomize.cc
|
2021-02-18 14:14:17 +11:00
|
|
|
geometry/nodes/node_geo_attribute_sample_texture.cc
|
2021-02-09 11:12:24 -06:00
|
|
|
geometry/nodes/node_geo_attribute_separate_xyz.cc
|
2021-01-11 12:06:52 -06:00
|
|
|
geometry/nodes/node_geo_attribute_vector_math.cc
|
2020-12-02 13:25:25 +01:00
|
|
|
geometry/nodes/node_geo_boolean.cc
|
2021-02-03 17:47:46 +01:00
|
|
|
geometry/nodes/node_geo_collection_info.cc
|
2020-12-11 15:00:22 +11:00
|
|
|
geometry/nodes/node_geo_common.cc
|
2020-12-02 13:25:25 +01:00
|
|
|
geometry/nodes/node_geo_edge_split.cc
|
2021-02-04 16:36:34 +01:00
|
|
|
geometry/nodes/node_geo_is_viewport.cc
|
2020-12-02 13:25:25 +01:00
|
|
|
geometry/nodes/node_geo_join_geometry.cc
|
|
|
|
geometry/nodes/node_geo_object_info.cc
|
|
|
|
geometry/nodes/node_geo_point_distribute.cc
|
|
|
|
geometry/nodes/node_geo_point_instance.cc
|
2021-01-13 10:10:25 -06:00
|
|
|
geometry/nodes/node_geo_point_rotate.cc
|
2021-01-13 10:30:42 -06:00
|
|
|
geometry/nodes/node_geo_point_scale.cc
|
|
|
|
geometry/nodes/node_geo_point_separate.cc
|
|
|
|
geometry/nodes/node_geo_point_translate.cc
|
2021-01-26 17:37:58 +01:00
|
|
|
geometry/nodes/node_geo_points_to_volume.cc
|
2020-12-11 15:00:22 +11:00
|
|
|
geometry/nodes/node_geo_subdivision_surface.cc
|
2021-02-19 13:20:04 -06:00
|
|
|
geometry/nodes/node_geo_subdivision_surface_simple.cc
|
2020-12-02 13:25:25 +01:00
|
|
|
geometry/nodes/node_geo_transform.cc
|
|
|
|
geometry/nodes/node_geo_triangulate.cc
|
2021-02-05 16:20:14 +01:00
|
|
|
geometry/nodes/node_geo_volume_to_mesh.cc
|
2020-12-02 13:25:25 +01:00
|
|
|
geometry/node_geometry_exec.cc
|
|
|
|
geometry/node_geometry_tree.cc
|
|
|
|
geometry/node_geometry_util.cc
|
|
|
|
|
2012-11-06 19:59:02 +00:00
|
|
|
shader/nodes/node_shader_add_shader.c
|
|
|
|
shader/nodes/node_shader_ambient_occlusion.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_attribute.c
|
|
|
|
shader/nodes/node_shader_background.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_bevel.c
|
|
|
|
shader/nodes/node_shader_blackbody.c
|
|
|
|
shader/nodes/node_shader_brightness.c
|
2012-10-10 13:02:20 +00:00
|
|
|
shader/nodes/node_shader_bsdf_anisotropic.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_bsdf_diffuse.c
|
|
|
|
shader/nodes/node_shader_bsdf_glass.c
|
2012-11-06 19:59:02 +00:00
|
|
|
shader/nodes/node_shader_bsdf_glossy.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_bsdf_hair.c
|
|
|
|
shader/nodes/node_shader_bsdf_hair_principled.c
|
|
|
|
shader/nodes/node_shader_bsdf_principled.c
|
2012-11-06 19:59:02 +00:00
|
|
|
shader/nodes/node_shader_bsdf_refraction.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_bsdf_toon.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_bsdf_translucent.c
|
|
|
|
shader/nodes/node_shader_bsdf_transparent.c
|
|
|
|
shader/nodes/node_shader_bsdf_velvet.c
|
2012-10-10 15:56:43 +00:00
|
|
|
shader/nodes/node_shader_bump.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_camera.c
|
2020-07-27 17:12:01 +02:00
|
|
|
shader/nodes/node_shader_clamp.cc
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_common.c
|
|
|
|
shader/nodes/node_shader_curves.c
|
|
|
|
shader/nodes/node_shader_displacement.c
|
|
|
|
shader/nodes/node_shader_eevee_specular.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_emission.c
|
|
|
|
shader/nodes/node_shader_fresnel.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_gamma.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_geometry.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_hair_info.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_holdout.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_hueSatVal.c
|
Cycles: Add Support for IES files as textures for light strength
This patch adds support for IES files, a file format that is commonly used to store the directional intensity distribution of light sources.
The new IES node is supposed to be plugged into the Strength input of the Emission node of the lamp.
Since people generating IES files do not really seem to care about the standard, the parser is flexible enough to accept all test files I have tried.
Some common weirdnesses are distributing values over multiple lines that should go into one line, using commas instead of spaces as delimiters and adding various useless stuff at the end of the file.
The user interface of the node is similar to the script node, the user can either select an internal Text or load a file.
Internally, IES files are handled similar to Image textures: They are stored in slots by the LightManager and each unique IES is assigned to one slot.
The local coordinate system of the lamp is used, so that the direction of the light can be changed. For UI reasons, it's usually best to add an area light,
rotate it and then change its type, since especially the point light does not immediately show its local coordinate system in the viewport.
Reviewers: #cycles, dingto, sergey, brecht
Reviewed By: #cycles, dingto, brecht
Subscribers: OgDEV, crazyrobinhood, secundar, cardboard, pisuke, intrah, swerner, micah_denn, harvester, gottfried, disnel, campbellbarton, duarteframos, Lapineige, brecht, juicyfruit, dingto, marek, rickyblender, bliblubli, lockal, sergey
Differential Revision: https://developer.blender.org/D1543
2018-05-27 00:46:37 +02:00
|
|
|
shader/nodes/node_shader_ies_light.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_invert.c
|
2012-11-06 19:59:02 +00:00
|
|
|
shader/nodes/node_shader_layer_weight.c
|
2012-05-07 20:24:38 +00:00
|
|
|
shader/nodes/node_shader_light_falloff.c
|
2012-11-06 19:59:02 +00:00
|
|
|
shader/nodes/node_shader_light_path.c
|
2020-07-16 13:25:57 +02:00
|
|
|
shader/nodes/node_shader_map_range.cc
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_mapping.c
|
2020-07-11 16:24:53 +02:00
|
|
|
shader/nodes/node_shader_math.cc
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_mixRgb.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_mix_shader.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_normal.c
|
2012-11-06 19:59:02 +00:00
|
|
|
shader/nodes/node_shader_normal_map.c
|
|
|
|
shader/nodes/node_shader_object_info.c
|
2019-12-17 10:07:44 +11:00
|
|
|
shader/nodes/node_shader_output_aov.c
|
2019-02-27 12:34:56 +11:00
|
|
|
shader/nodes/node_shader_output_light.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_output_linestyle.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_output_material.c
|
|
|
|
shader/nodes/node_shader_output_world.c
|
2012-11-06 19:59:02 +00:00
|
|
|
shader/nodes/node_shader_particle_info.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_rgb.c
|
2012-11-06 19:59:02 +00:00
|
|
|
shader/nodes/node_shader_script.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_sepcombHSV.c
|
2020-07-16 16:08:18 +02:00
|
|
|
shader/nodes/node_shader_sepcombRGB.cc
|
2020-07-07 18:23:33 +02:00
|
|
|
shader/nodes/node_shader_sepcombXYZ.cc
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_shaderToRgb.c
|
|
|
|
shader/nodes/node_shader_squeeze.c
|
2013-04-01 20:26:52 +00:00
|
|
|
shader/nodes/node_shader_subsurface_scattering.c
|
2012-11-06 19:59:02 +00:00
|
|
|
shader/nodes/node_shader_tangent.c
|
|
|
|
shader/nodes/node_shader_tex_brick.c
|
|
|
|
shader/nodes/node_shader_tex_checker.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_tex_coord.c
|
|
|
|
shader/nodes/node_shader_tex_environment.c
|
2012-11-06 19:59:02 +00:00
|
|
|
shader/nodes/node_shader_tex_gradient.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_tex_image.c
|
|
|
|
shader/nodes/node_shader_tex_magic.c
|
|
|
|
shader/nodes/node_shader_tex_musgrave.c
|
|
|
|
shader/nodes/node_shader_tex_noise.c
|
2015-07-18 22:36:09 +02:00
|
|
|
shader/nodes/node_shader_tex_pointdensity.c
|
2011-11-08 11:38:16 +00:00
|
|
|
shader/nodes/node_shader_tex_sky.c
|
|
|
|
shader/nodes/node_shader_tex_voronoi.c
|
|
|
|
shader/nodes/node_shader_tex_wave.c
|
2019-08-21 20:04:09 +02:00
|
|
|
shader/nodes/node_shader_tex_white_noise.c
|
2014-07-20 12:14:31 +09:00
|
|
|
shader/nodes/node_shader_uvAlongStroke.c
|
2014-04-02 11:40:29 +02:00
|
|
|
shader/nodes/node_shader_uvmap.c
|
2020-07-16 15:49:56 +02:00
|
|
|
shader/nodes/node_shader_valToRgb.cc
|
2020-07-11 16:24:53 +02:00
|
|
|
shader/nodes/node_shader_value.cc
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_vectTransform.c
|
|
|
|
shader/nodes/node_shader_vector_displacement.c
|
2020-07-11 16:24:53 +02:00
|
|
|
shader/nodes/node_shader_vector_math.cc
|
2020-03-14 15:22:04 +11:00
|
|
|
shader/nodes/node_shader_vector_rotate.c
|
2019-09-27 12:45:54 +10:00
|
|
|
shader/nodes/node_shader_vertex_color.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_volume_absorption.c
|
2019-08-21 20:22:24 +02:00
|
|
|
shader/nodes/node_shader_volume_info.c
|
2019-01-25 08:30:33 +11:00
|
|
|
shader/nodes/node_shader_volume_principled.c
|
|
|
|
shader/nodes/node_shader_volume_scatter.c
|
|
|
|
shader/nodes/node_shader_wavelength.c
|
|
|
|
shader/nodes/node_shader_wireframe.c
|
2011-09-05 21:01:50 +00:00
|
|
|
shader/node_shader_tree.c
|
|
|
|
shader/node_shader_util.c
|
|
|
|
|
|
|
|
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
|
|
|
|
|
2020-07-17 11:36:59 +02:00
|
|
|
intern/derived_node_tree.cc
|
2020-12-02 13:25:25 +01:00
|
|
|
intern/math_functions.cc
|
2011-09-05 21:01:50 +00:00
|
|
|
intern/node_common.c
|
2019-01-25 08:30:33 +11:00
|
|
|
intern/node_exec.c
|
2020-12-02 13:25:25 +01:00
|
|
|
intern/node_geometry_exec.cc
|
2020-06-29 17:36:06 +02:00
|
|
|
intern/node_socket.cc
|
2020-07-23 12:09:28 +02:00
|
|
|
intern/node_tree_dependencies.cc
|
2020-07-17 11:36:59 +02:00
|
|
|
intern/node_tree_multi_function.cc
|
|
|
|
intern/node_tree_ref.cc
|
2019-01-25 08:30:33 +11:00
|
|
|
intern/node_util.c
|
2020-12-02 13:25:25 +01:00
|
|
|
intern/type_callbacks.cc
|
2011-09-05 21:01:50 +00:00
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
composite/node_composite_util.h
|
2020-07-07 18:23:33 +02:00
|
|
|
function/node_function_util.hh
|
2011-09-05 21:01:50 +00:00
|
|
|
shader/node_shader_util.h
|
2020-12-02 13:25:25 +01:00
|
|
|
geometry/node_geometry_util.hh
|
2011-09-05 21:01:50 +00:00
|
|
|
texture/node_texture_util.h
|
2010-11-29 04:35:56 +00:00
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
NOD_common.h
|
2011-09-05 21:01:50 +00:00
|
|
|
NOD_composite.h
|
2020-07-17 11:36:59 +02:00
|
|
|
NOD_derived_node_tree.hh
|
2020-04-20 15:27:12 +02:00
|
|
|
NOD_function.h
|
2020-12-11 15:00:22 +11:00
|
|
|
NOD_geometry.h
|
2021-01-20 16:08:52 +11:00
|
|
|
NOD_geometry_exec.hh
|
2020-12-11 15:00:22 +11:00
|
|
|
NOD_math_functions.hh
|
2020-07-23 12:09:28 +02:00
|
|
|
NOD_node_tree_dependencies.hh
|
2020-07-17 11:36:59 +02:00
|
|
|
NOD_node_tree_multi_function.hh
|
|
|
|
NOD_node_tree_ref.hh
|
2011-09-05 21:01:50 +00:00
|
|
|
NOD_shader.h
|
|
|
|
NOD_socket.h
|
2013-03-18 16:34:57 +00:00
|
|
|
NOD_static_types.h
|
2019-01-25 08:30:33 +11:00
|
|
|
NOD_texture.h
|
2020-12-02 13:25:25 +01:00
|
|
|
NOD_type_callbacks.hh
|
2011-09-05 21:01:50 +00:00
|
|
|
intern/node_common.h
|
2019-01-25 08:30:33 +11:00
|
|
|
intern/node_exec.h
|
|
|
|
intern/node_util.h
|
2010-10-23 04:05:55 +00:00
|
|
|
)
|
|
|
|
|
2019-04-14 15:18:44 +02:00
|
|
|
set(LIB
|
2020-12-11 15:00:22 +11:00
|
|
|
bf_bmesh
|
2020-07-07 18:23:33 +02:00
|
|
|
bf_functions
|
2020-07-09 17:19:52 +02:00
|
|
|
bf_intern_sky
|
2019-04-14 15:18:44 +02:00
|
|
|
)
|
|
|
|
|
2008-12-31 05:20:35 +00:00
|
|
|
if(WITH_PYTHON)
|
2011-07-16 23:01:14 +00:00
|
|
|
list(APPEND INC
|
|
|
|
../python
|
|
|
|
)
|
|
|
|
list(APPEND INC_SYS
|
|
|
|
${PYTHON_INCLUDE_DIRS}
|
|
|
|
)
|
CMake: Refactor external dependencies handling
This is a more correct fix to the issue Brecht was fixing in D6600.
While the fix in that patch worked fine for linking it broke ASAN
runtime under some circumstances.
For example, `make full debug developer` would compile, but trying
to start blender will cause assert failure in ASAN (related on check
that ASAN is not running already).
Top-level idea: leave it to CMake to keep track of dependency graph.
The root of the issue comes to the fact that target like "blender" is
configured to use a lot of static libraries coming from Blender sources
and to use external static libraries. There is nothing which ensures
order between blender's and external libraries. Only order of blender
libraries is guaranteed.
It was possible that due to a cycle or other circumstances some of
blender libraries would have been passed to linker after libraries
it uses, causing linker errors.
For example, this order will likely fail:
libbf_blenfont.a libfreetype6.a libbf_blenfont.a
This change makes it so blender libraries are explicitly provided
their dependencies to an external libraries, which allows CMake to
ensure they are always linked against them.
General rule here: if bf_foo depends on an external library it is
to be provided to LIBS for bf_foo.
For example, if bf_blenkernel depends on opensubdiv then LIBS in
blenkernel's CMakeLists.txt is to include OPENSUBDIB_LIBRARIES.
The change is made based on searching for used include folders
such as OPENSUBDIV_INCLUDE_DIRS and adding corresponding libraries
to LIBS ion that CMakeLists.txt. Transitive dependencies are not
simplified by this approach, but I am not aware of any downside of
this: CMake should be smart enough to simplify them on its side.
And even if not, this shouldn't affect linking time.
Benefit of not relying on transitive dependencies is that build
system is more robust towards future changes. For example, if
bf_intern_opensubiv is no longer depends on OPENSUBDIV_LIBRARIES
and all such code is moved to bf_blenkernel this will not break
linking.
The not-so-trivial part is change to blender_add_lib (and its
version in Cycles). The complexity is caused by libraries being
provided as a single list argument which doesn't allow to use
different release and debug libraries on Windows. The idea is:
- Have every library prefixed as "optimized" or "debug" if
separation is needed (non-prefixed libraries will be considered
"generic").
- Loop through libraries passed to function and do simple parsing
which will look for "optimized" and "debug" words and specify
following library to corresponding category.
This isn't something particularly great. Alternative would be to
use target_link_libraries() directly, which sounds like more code
but which is more explicit and allows to have more flexibility
and control comparing to wrapper approach.
Tested the following configurations on Linux, macOS and Windows:
- make full debug developer
- make full release developer
- make lite debug developer
- make lite release developer
NOTE: Linux libraries needs to be compiled with D6641 applied,
otherwise, depending on configuration, it's possible to run into
duplicated zlib symbols error.
Differential Revision: https://developer.blender.org/D6642
2020-01-20 18:36:19 +01:00
|
|
|
list(APPEND LIB
|
|
|
|
${PYTHON_LINKFLAGS}
|
|
|
|
${PYTHON_LIBRARIES}
|
|
|
|
)
|
2010-10-31 04:11:39 +00:00
|
|
|
add_definitions(-DWITH_PYTHON)
|
2008-12-31 05:20:35 +00:00
|
|
|
endif()
|
|
|
|
|
2012-03-17 12:07:58 +00:00
|
|
|
if(WITH_INTERNATIONAL)
|
|
|
|
add_definitions(-DWITH_INTERNATIONAL)
|
|
|
|
endif()
|
|
|
|
|
2021-02-05 08:28:31 -06:00
|
|
|
if(WITH_TBB)
|
2021-02-12 20:08:43 +01:00
|
|
|
list(APPEND INC_SYS
|
|
|
|
${TBB_INCLUDE_DIRS}
|
|
|
|
)
|
2021-02-05 08:28:31 -06:00
|
|
|
add_definitions(-DWITH_TBB)
|
|
|
|
endif()
|
|
|
|
|
2012-03-01 07:56:15 +00:00
|
|
|
if(WITH_IMAGE_OPENEXR)
|
|
|
|
add_definitions(-DWITH_OPENEXR)
|
|
|
|
endif()
|
|
|
|
|
2012-06-30 14:14:22 +00:00
|
|
|
if(WITH_COMPOSITOR)
|
|
|
|
list(APPEND INC
|
|
|
|
../compositor
|
|
|
|
)
|
|
|
|
add_definitions(-DWITH_COMPOSITOR)
|
|
|
|
endif()
|
|
|
|
|
2014-07-11 16:51:04 +09:00
|
|
|
if(WITH_FREESTYLE)
|
|
|
|
add_definitions(-DWITH_FREESTYLE)
|
|
|
|
endif()
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
if(WITH_OPENSUBDIV)
|
|
|
|
add_definitions(-DWITH_OPENSUBDIV)
|
|
|
|
endif()
|
|
|
|
|
2021-01-21 10:32:42 +01:00
|
|
|
if(WITH_OPENVDB)
|
|
|
|
list(APPEND INC_SYS
|
|
|
|
${OPENVDB_INCLUDE_DIRS}
|
|
|
|
)
|
|
|
|
add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
|
|
|
|
endif()
|
|
|
|
|
2019-04-14 15:18:44 +02:00
|
|
|
blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|