blender
/
blender
136
419
Fork 601
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Replace Default OCIO config with AgX (Filmic v2) #106355

Closed
Zijun Zhou wants to merge 112 commits from (deleted):main into main
pull from: (deleted):main
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 99 Commits 112 Files Changed 29 +11 -9
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8fa801f9b9 - Show all commits

12
release/license/THIRD-PARTY-LICENSES.txt
View File

@ -330,7 +330,7 @@ external contributions to this project including patches, pull requests, etc.
** libAOM; version 3.4.0 -- https://aomedia.googlesource.com/aom/
Copyright (c) 2016, Alliance for Open Media. All rights reserved.
** NASM; version 2.15.02 -- https://www.nasm.us/
Contributions since 2008-12-15 are Copyright Intel Corporation.
Copyright 1996-2010 the NASM Authors - All rights reserved.
** OpenJPEG; version 2.5.0 -- https://github.com/uclouvain/openjpeg
Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
Copyright (c) 2002-2014, Professor Benoit Macq
@ -369,7 +369,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Ceres Solver - A fast non-linear least squares minimizer
Copyright 2016 Google Inc. All rights reserved.
** Curve-Fit-nD; version ddcd5bd -- https://github.com/ideasman42/curve-fit-nd
Copyright (c) 2016, Blender Foundation.
Copyright (c) 2016, DWANGO Co., Ltd.
Copyright (c) 2016, Campbell Barton
All rights reserved.
** Google C++ Testing Framework; version 1.10.0 --
https://github.com/google/googletest
Copyright 2007, Google Inc.
@ -381,11 +383,13 @@ All rights reserved.
Copyright (c) 2006, Google Inc.
All rights reserved.
** Imath; version 3.1.5 -- https://github.com/AcademySoftwareFoundation/Imath
Contributors to the OpenEXR Project.
Copyright Contributors to the OpenEXR Project. All rights reserved.
** ISPC; version 1.17.0 -- https://github.com/ispc/ispc
Copyright Intel Corporation
All rights reserved.
** NumPy; version 1.23.5 -- https://numpy.org/
Copyright (c) 2005-2021, NumPy Developers.
Copyright (c) 2005-2022, NumPy Developers.
All rights reserved.
** Ogg; version 1.3.5 -- https://www.xiph.org/ogg/
COPYRIGHT (C) 1994-2019 by the Xiph.Org Foundation https://www.xiph.org/
** Open Shading Language; version

2
source/blender/draw/engines/workbench/workbench_shadow.cc
View File

@ -352,7 +352,7 @@ void ShadowPass::init(const SceneState &scene_state, SceneResources &resources)
float4x4 view_matrix;
DRW_view_viewmat_get(nullptr, view_matrix.ptr(), false);
resources.world_buf.shadow_direction_vs = float4(
math::transform_direction(view_matrix, direction_ws));
math::transform_direction(view_matrix, direction_ws), 0.0f);
/* Clamp to avoid overshadowing and shading errors. */
float focus = clamp_f(scene.display.shadow_focus, 0.0001f, 0.99999f);

6
source/blender/io/wavefront_obj/tests/obj_import_string_utils_tests.cc
View File

@ -140,11 +140,9 @@ TEST(obj_import_string_utils, parse_float_invalid)
EXPECT_EQ(val, -1.0f);
EXPECT_STRREF_EQ("..5", parse_float("..5", -2.0f, val));
EXPECT_EQ(val, -2.0f);
/* Out of float range. Current float parser (fast_float)
* clamps out of range numbers to +/- infinity, so this
* one gets a +inf instead of fallback -3.0. */
/* Out of float range. */
EXPECT_STRREF_EQ(" a", parse_float("9.0e500 a", -3.0f, val));
EXPECT_EQ(val, std::numeric_limits<float>::infinity());
EXPECT_EQ(val, -3.0f);
/* Has leading white-space when we don't expect it */
EXPECT_STRREF_EQ(" 1", parse_float(" 1", -4.0f, val, false));
EXPECT_EQ(val, -4.0f);