Merge branch 'RB-2.3' into RB-2

NatronGitHub · Jun 8, 2020 · f18394c · f18394c
2 parents 608da56 + 8f2cf8f
commit f18394c
Show file tree

Hide file tree

Showing 838 changed files with 9,524 additions and 4,172 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-Please read the [contribution guidelines](https://github.com/MrKepzie/Natron/blob/master/CONTRIBUTING.md), and be sure we have a [Contributor License Agreement](http://natron.fr/cla) on record with the project.
+Please read the [contribution guidelines](https://github.com/NatronGitHub/Natron/blob/master/CONTRIBUTING.md).
 
 ## Description
 

diff --git a/.travis.yml b/.travis.yml
@@ -40,7 +40,7 @@ addons:
     # this one is for xenial ffmpeg
     - sourceline: 'ppa:jonathonf/ffmpeg-4'
     #- kalakris-cmake
-    - pythonxy-devel
+    #- pythonxy-devel
     packages:
     - ca-certificates
     #- gcc-4.9
@@ -127,8 +127,8 @@ matrix:
   exclude:
     - os: osx
       compiler: gcc
-  allow_failures:
-    - os: osx # if we exceed the time limit, if if qt4 is still using openssl 1.0
+  #allow_failures:
+  #  - os: osx # if we exceed the time limit
   fast_finish: true
 
 

diff --git a/App/App.pro b/App/App.pro
@@ -1,6 +1,7 @@
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of Natron <https://natrongithub.github.io/>,
 # Copyright (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+# Copyright (C) 2018-2020 The Natron developers
 #
 # Natron is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/App/NatronApp_main.cpp b/App/NatronApp_main.cpp
@@ -1,6 +1,7 @@
 /* ***** BEGIN LICENSE BLOCK *****
  * This file is part of Natron <https://natrongithub.github.io/>,
  * Copyright (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+ * Copyright (C) 2018-2020 The Natron developers
  *
  * Natron is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/BreakpadClient/BreakpadClient.pro b/BreakpadClient/BreakpadClient.pro
@@ -1,6 +1,7 @@
 # ***** BEGIN LICENSE BLOCK *****
-# This file is part of Natron <http://www.natron.fr/>,
-# Copyright (C) 2016 INRIA and Alexandre Gauthier-Foichat
+# This file is part of Natron <https://natrongithub.github.io/>,
+# Copyright (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+# Copyright (C) 2018-2020 The Natron developers
 #
 # Natron is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Known Bugs
 
-- https://github.com/NatronGitHub/Natron/issues/445
+- https://github.com/NatronGitHub/Natron/issues/504
 
 # History
 
@@ -15,6 +15,10 @@
 - Fix loading of Python Toolsets, and document how Toolsets are detected.
 - Fix using Rotopaint with multiple layers. #420 #205
 - Fix loading project settings. #439
+- Fix property panels of PyPlug nodes. #449
+- Fix missing python API entry points. #485
+- Make "Use Host Interact" setting available from user parameters. #490
+- Fix deadlock when creating a dialog from initGui.py. #487
 
 ### Plugins
 
@@ -23,11 +27,17 @@
 - Update CImg and G'MIC to 2.8.4 and fix several issues in GMIC plugins (which are still beta).
 - Many new GMIC plugins, including GMIC Custom Code.
 - FrameRange: New options "Loop" and "Bounce". #411
-- Update OpenImageIO to 2.1.10.1. #350
+- Update OpenImageIO to 2.1.11.0. #350
 - Fix reading multi-view EXRs. #429
 - Support for reading and writing HEIF/HEIC images. HEIC is the still-image sibling of HEVC (a.k.a. H.265), and compresses to about half the size of JPEG but with higher visual quality.
-- Text: Added SRT subtitle format support
-- AudioCurve (audio curve generator): new plugin
+- Text: Added SRT subtitle format support.
+- AudioCurve (audio curve generator): new plugin.
+- Fix plugin bugs (IO and CImg) with images that take more than 2GiB of memory (e.g. 12000x12000 RGBA float). #456
+- Fix "Fill" PyPlug: was not filling everything if the Source was larger than the project. #475
+- Shadertoy: use the preset name as a sublabel.
+- LensDistortion/IDistort/STMap: add "Use src RoD" option to override format.
+- Blur: fix handling of render scale when computing derivatives. #496
+- Text: fix animating font family and retiming the text output. #482 #476
 
 
 ## Version 2.3.14

diff --git a/CrashReporter/CallbacksManager.cpp b/CrashReporter/CallbacksManager.cpp
@@ -1,6 +1,7 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * This file is part of Natron <http://www.natron.fr/>,
- * Copyright (C) 2016 INRIA and Alexandre Gauthier-Foichat
+ * This file is part of Natron <https://natrongithub.github.io/>,
+ * Copyright (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+ * Copyright (C) 2018-2020 The Natron developers
  *
  * Natron is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/CrashReporter/CallbacksManager.h b/CrashReporter/CallbacksManager.h
@@ -1,6 +1,7 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * This file is part of Natron <http://www.natron.fr/>,
- * Copyright (C) 2016 INRIA and Alexandre Gauthier-Foichat
+ * This file is part of Natron <https://natrongithub.github.io/>,
+ * Copyright (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+ * Copyright (C) 2018-2020 The Natron developers
  *
  * Natron is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/CrashReporter/CrashDialog.cpp b/CrashReporter/CrashDialog.cpp
@@ -1,6 +1,7 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * This file is part of Natron <http://www.natron.fr/>,
- * Copyright (C) 2016 INRIA and Alexandre Gauthier-Foichat
+ * This file is part of Natron <https://natrongithub.github.io/>,
+ * Copyright (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+ * Copyright (C) 2018-2020 The Natron developers
  *
  * Natron is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/CrashReporter/CrashDialog.h b/CrashReporter/CrashDialog.h
@@ -1,6 +1,7 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * This file is part of Natron <http://www.natron.fr/>,
- * Copyright (C) 2016 INRIA and Alexandre Gauthier-Foichat
+ * This file is part of Natron <https://natrongithub.github.io/>,
+ * Copyright (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+ * Copyright (C) 2018-2020 The Natron developers
  *
  * Natron is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/CrashReporter/CrashReporter.pro b/CrashReporter/CrashReporter.pro
@@ -1,6 +1,7 @@
 # ***** BEGIN LICENSE BLOCK *****
-# This file is part of Natron <http://www.natron.fr/>,
-# Copyright (C) 2016 INRIA and Alexandre Gauthier-Foichat
+# This file is part of Natron <https://natrongithub.github.io/>,
+# Copyright (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+# Copyright (C) 2018-2020 The Natron developers
 #
 # Natron is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/CrashReporter/main.cpp b/CrashReporter/main.cpp
@@ -1,6 +1,7 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * This file is part of Natron <http://www.natron.fr/>,
- * Copyright (C) 2016 INRIA and Alexandre Gauthier-Foichat
+ * This file is part of Natron <https://natrongithub.github.io/>,
+ * Copyright (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+ * Copyright (C) 2018-2020 The Natron developers
  *
  * Natron is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/CrashReporterCLI/CrashReporterCLI.pro b/CrashReporterCLI/CrashReporterCLI.pro
@@ -1,6 +1,7 @@
 # ***** BEGIN LICENSE BLOCK *****
-# This file is part of Natron <http://www.natron.fr/>,
-# Copyright (C) 2016 INRIA and Alexandre Gauthier-Foichat
+# This file is part of Natron <https://natrongithub.github.io/>,
+# Copyright (C) 2013-2018 INRIA and Alexandre Gauthier-Foichat
+# Copyright (C) 2018-2020 The Natron developers
 #
 # Natron is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Documentation/source/_groupGMIC.rst b/Documentation/source/_groupGMIC.rst
@@ -103,6 +103,7 @@ The following sections contain documentation about every node in the GMIC group.
     plugins/eu.gmic.DistanceTransform.rst
     plugins/eu.gmic.DistortLens.rst
     plugins/eu.gmic.Dithering.rst
+    plugins/eu.gmic.DragonCurve.rst
     plugins/eu.gmic.DrawnMontage.rst
     plugins/eu.gmic.DropShadow.rst
     plugins/eu.gmic.DropShadow3D.rst
@@ -214,6 +215,7 @@ The following sections contain documentation about every node in the GMIC group.
     plugins/eu.gmic.Mosaic.rst
     plugins/eu.gmic.MultiscaleOperator.rst
     plugins/eu.gmic.NeonLightning.rst
+    plugins/eu.gmic.NewtonFractal.rst
     plugins/eu.gmic.NoiseAdditive.rst
     plugins/eu.gmic.NoisePerlin.rst
     plugins/eu.gmic.NoiseSpread.rst
@@ -278,6 +280,7 @@ The following sections contain documentation about every node in the GMIC group.
     plugins/eu.gmic.SharpenDeblur.rst
     plugins/eu.gmic.SharpenGoldMeinel.rst
     plugins/eu.gmic.SharpenInverseDiffusion.rst
+    plugins/eu.gmic.SharpenMultiscale.rst
     plugins/eu.gmic.SharpenOctaveSharpening.rst
     plugins/eu.gmic.SharpenRichardsonLucy.rst
     plugins/eu.gmic.SharpenShockFilters.rst
@@ -343,6 +346,7 @@ The following sections contain documentation about every node in the GMIC group.
     plugins/eu.gmic.ToneMappingFast.rst
     plugins/eu.gmic.TonestoLayers.rst
     plugins/eu.gmic.TransferColorsHistogram.rst
+    plugins/eu.gmic.TransferColorsPCA.rst
     plugins/eu.gmic.TransferColorsVariational.rst
     plugins/eu.gmic.Truchet.rst
     plugins/eu.gmic.Tunnel.rst

diff --git a/Documentation/source/_groupOther.rst b/Documentation/source/_groupOther.rst
@@ -8,6 +8,7 @@ The following sections contain documentation about every node in the Other group
 .. toctree::
     :maxdepth: 1
 
+    plugins/net.fxarena.openfx.AudioCurve.rst
     plugins/fr.inria.built-in.BackDrop.rst
     plugins/fr.inria.built-in.DiskCache.rst
     plugins/fr.inria.built-in.Dot.rst

diff --git a/Documentation/source/_prefs.rst b/Documentation/source/_prefs.rst
@@ -1,4 +1,6 @@
-.. Do not edit this file! It is generated automatically by Natron itself.
+.. raw:: html
+
+   <!--Do not edit this file! It is generated automatically by Natron itself. -->
 
 Preferences
 ===========

diff --git a/Documentation/source/conf.py b/Documentation/source/conf.py
@@ -41,7 +41,7 @@
 
 # General information about the project.
 project = u'Natron'
-copyright = u'2013-2018 The Natron documentation authors, licensed under CC BY-SA 4.0'
+copyright = u'2013-2020 The Natron documentation authors, licensed under CC BY-SA 4.0'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/Documentation/source/devel/conf.py b/Documentation/source/devel/conf.py
@@ -46,8 +46,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = 'Natron'
-copyright = '2013-2018 The Natron documentation authors, licensed under CC BY-SA 4.0'
+project = u'Natron'
+copyright = u'2013-2020 The Natron documentation authors, licensed under CC BY-SA 4.0'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/Documentation/source/guide/conf.py b/Documentation/source/guide/conf.py
@@ -41,7 +41,7 @@
 
 # General information about the project.
 project = u'Natron'
-copyright = u'2013-2018 The Natron documentation authors, licensed under CC BY-SA 4.0'
+copyright = u'2013-2020 The Natron documentation authors, licensed under CC BY-SA 4.0'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/Documentation/source/plugins/eu.gmic.AboutGMIC.rst b/Documentation/source/plugins/eu.gmic.AboutGMIC.rst
@@ -180,7 +180,7 @@ Release Notes
 
 - 2019/08/14 : version 2.7.0.
 
-- 2019/12/19 : version 2.8.1 (Current stable).
+- 2020/02/10 : version 2.8.4 (Current stable).
 
 View latest minor changelog (2.8): https://discuss.pixls.us/t/release-of-gmic-2-8
 

diff --git a/Documentation/source/plugins/eu.gmic.AlignLayers.rst b/Documentation/source/plugins/eu.gmic.AlignLayers.rst
@@ -12,7 +12,7 @@ G’MIC Align Layers node
 Description
 -----------
 
-Author: David Tschumperle. Latest Update: 2010/29/12.
+Author: David Tschumperle. Latest Update: 2020/01/11.
 
 Wrapper for the G’MIC framework (http://gmic.eu) written by Tobias Fleischer (http://www.reduxfx.com) and Frederic Devernay.
 

diff --git a/Documentation/source/plugins/eu.gmic.BlendAverageAll.rst b/Documentation/source/plugins/eu.gmic.BlendAverageAll.rst
@@ -71,6 +71,8 @@ Controls
 +-----------------------------------------------+---------+---------+-----------------------+
 | Ignore Alpha / ``Ignore_Alpha``               | Boolean | Off     |                       |
 +-----------------------------------------------+---------+---------+-----------------------+
+| Preview/Draft Mode / ``PreviewDraft_Mode``    | Boolean | Off     |                       |
++-----------------------------------------------+---------+---------+-----------------------+
 | Global Random Seed / ``Global_Random_Seed``   | Integer | 0       |                       |
 +-----------------------------------------------+---------+---------+-----------------------+
 | Animate Random Seed / ``Animate_Random_Seed`` | Boolean | Off     |                       |

diff --git a/Documentation/source/plugins/eu.gmic.BlendEdges.rst b/Documentation/source/plugins/eu.gmic.BlendEdges.rst
@@ -72,6 +72,8 @@ Controls
 +-----------------------------------------------+---------+---------+-----------------------+
 | Ignore Alpha / ``Ignore_Alpha``               | Boolean | Off     |                       |
 +-----------------------------------------------+---------+---------+-----------------------+
+| Preview/Draft Mode / ``PreviewDraft_Mode``    | Boolean | Off     |                       |
++-----------------------------------------------+---------+---------+-----------------------+
 | Global Random Seed / ``Global_Random_Seed``   | Integer | 0       |                       |
 +-----------------------------------------------+---------+---------+-----------------------+
 | Animate Random Seed / ``Animate_Random_Seed`` | Boolean | Off     |                       |

diff --git a/Documentation/source/plugins/eu.gmic.BlendFade.rst b/Documentation/source/plugins/eu.gmic.BlendFade.rst
@@ -100,6 +100,8 @@ Controls
 +-----------------------------------------------+---------+--------------------------------+-----------------------+
 | Ignore Alpha / ``Ignore_Alpha``               | Boolean | Off                            |                       |
 +-----------------------------------------------+---------+--------------------------------+-----------------------+
+| Preview/Draft Mode / ``PreviewDraft_Mode``    | Boolean | Off                            |                       |
++-----------------------------------------------+---------+--------------------------------+-----------------------+
 | Global Random Seed / ``Global_Random_Seed``   | Integer | 0                              |                       |
 +-----------------------------------------------+---------+--------------------------------+-----------------------+
 | Animate Random Seed / ``Animate_Random_Seed`` | Boolean | Off                            |                       |

diff --git a/Documentation/source/plugins/eu.gmic.BlendMedian.rst b/Documentation/source/plugins/eu.gmic.BlendMedian.rst
@@ -71,6 +71,8 @@ Controls
 +-----------------------------------------------+---------+---------+-----------------------+
 | Ignore Alpha / ``Ignore_Alpha``               | Boolean | Off     |                       |
 +-----------------------------------------------+---------+---------+-----------------------+
+| Preview/Draft Mode / ``PreviewDraft_Mode``    | Boolean | Off     |                       |
++-----------------------------------------------+---------+---------+-----------------------+
 | Global Random Seed / ``Global_Random_Seed``   | Integer | 0       |                       |
 +-----------------------------------------------+---------+---------+-----------------------+
 | Animate Random Seed / ``Animate_Random_Seed`` | Boolean | Off     |                       |