blender
/
blender
136
411
Fork 593
Code Issues 6.3k Pull Requests 771 Projects 19 Wiki Activity

Extern: Update json library to version 3.11.3 #118899

Open
Jakub Marcowski wants to merge 2 commits from Chubercik/blender:json-3.11.3 into main
pull from: Chubercik/blender:json-3.11.3
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 2 Files Changed 3 +915 -746
3 changed files with 915 additions and 746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/json/README.blender vendored
View File

@ -1,5 +1,5 @@
Project: JSON
URL: https://github.com/nlohmann/json/
License: MIT License
Upstream version: 3.11.2
Upstream version: 3.11.3
Local modifications: None

1657
extern/json/include/json.hpp vendored
View File

File diff suppressed because it is too large Load Diff

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

@ -3479,7 +3479,7 @@ https://github.com/intel/gmmlib
Copyright (c) 2017 Intel Corporation.
Copyright (c) 2016 Gabi Melman.
Copyright 2008, Google Inc. All rights reserved.
** JSON for Modern C++; version 3.11.2 -- https://github.com/nlohmann/json/
** JSON for Modern C++; version 3.11.3 -- https://github.com/nlohmann/json/
Copyright (c) 2013-2021 Niels Lohmann
** libdecor; version 0.1.0 -- https://gitlab.freedesktop.org/libdecor/libdecor
Copyright © 2010 Intel Corporation