the main development branch is now master

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 Please ask questions ("how do I...?") on the [forum](http://forum.natron.fr), not by filing issues.
 
 Make concrete suggestions for fixing the code ("here is a patch") by filing
-a [pull request](https://github.com/MrKepzie/Natron/pull/new/workshop), not an issue.
+a [pull request](https://github.com/MrKepzie/Natron/pull/new/master), not an issue.
 
 
 ### Problem
@@ -21,7 +21,7 @@ Describe the problem or suggestion here.
  * If your problem is a crash in a custom build, please create a [gist](https://gist.github.com)
  that contains a _full_ backtrace.
 
- * If you are reporting a problem about a release branch, have you tried the current head of `workshop`
+ * If you are reporting a problem about a release branch, have you tried the current head of `master`
  to see if the problem has been fixed?
 
 ### Steps to Reproduce

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-Please read the [contribution guidelines](https://github.com/MrKepzie/Natron/blob/workshop/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/MrKepzie/Natron/blob/master/CONTRIBUTING.md), and be sure we have a [Contributor License Agreement](http://natron.fr/cla) on record with the project.
 
 ## Description
 

CONTRIBUTING.md

@@ -54,7 +54,7 @@ All code must be formally reviewed before being merged into the official reposit
 3. Push your changes to your fork (each unrelated pull request to a separate
 "topic branch", please).
 
-4. Make a "pull request" on GitHub for your patch, use the workshop branch.
+4. Make a "pull request" on GitHub for your patch, use the "master" branch.
 
 5. If your patch will induce a major compatibility break, or has a design
 component that deserves extended discussion or debate among the wider Natron
@@ -66,7 +66,7 @@ or discuss in email/forum. Reviewers may ask for changes, explain problems they
 found, congratulate the author on a clever solution, etc. Please don't take it hard if your
 first try is not accepted. It happens to all of us.
 
-7. After approval, one of the senior developers (with commit approval to the official main repository) will merge your fixes into the workshop branch.
+7. After approval, one of the senior developers (with commit approval to the official main repository) will merge your fixes into the "master" branch.
 
 
 Coding Style

Documentation/source/PythonReference/NatronEngine/Natron.rst

@@ -146,7 +146,7 @@ that are more complicated than a simple boolean value.
 
 .. attribute:: NatronEngine.Natron.PixmapEnum
 
-	See `here <https://github.com/MrKepzie/Natron/blob/workshop/Global/Enums.h>`_	for
+	See `here <https://github.com/MrKepzie/Natron/blob/master/Global/Enums.h>`_	for
 	potential values of this enumeration. 
 
 .. attribute:: NatronEngine.Natron.ViewerColorSpaceEnum

Documentation/source/PythonReference/NatronEngine/PathParam.rst

@@ -42,7 +42,7 @@ are escaped as per the XML specification:
 	* *'* becomes '
 
 Some more characters are escaped, you can see the full function in the source code of Natron
-`here <https://github.com/MrKepzie/Natron/blob/workshop/Engine/ProjectPrivate.cpp>`_
+`here <https://github.com/MrKepzie/Natron/blob/master/Engine/ProjectPrivate.cpp>`_
 
 
 

Engine/NodeGroup.cpp

@@ -2699,7 +2699,7 @@ NodeCollection::exportGroupToPython(const QString& pluginID,
     WRITE_STATIC_LINE();
     QString handWrittenStr = QString::fromUtf8("# Hand-written code should be added in a separate file named %1.py").arg(extModule);
     WRITE_STRING(handWrittenStr);
-    WRITE_STATIC_LINE("# See http://natron.readthedocs.org/en/workshop/groups.html#adding-hand-written-code-callbacks-etc");
+    WRITE_STATIC_LINE("# See http://natron.readthedocs.org/en/master/groups.html#adding-hand-written-code-callbacks-etc");
     WRITE_STATIC_LINE("# Note that Viewers are never exported");
     WRITE_STATIC_LINE();
     WRITE_STATIC_LINE("import " NATRON_ENGINE_PYTHON_MODULE_NAME);

Global/GitVersion.h

@@ -1,6 +1,6 @@
 #ifndef NATRON_GITVERSION_H_
 #define NATRON_GITVERSION_H_
-#define GIT_BRANCH "workshop"
+#define GIT_BRANCH "master"
 #define GIT_COMMIT "d9dcaf1cf836b8f4cd15b2ed13e01b82c834dbe2"
 #define IO_GIT_COMMIT ""
 #define MISC_GIT_COMMIT ""

Global/Macros.h

@@ -60,7 +60,7 @@ namespace NATRON_NAMESPACE { }
 #define NATRON_APPLICATION_NAME "Natron"
 #define NATRON_WEBSITE_URL "http://www.natron.fr"
 #define NATRON_FORUM_URL "https://forum.natron.fr"
-#define NATRON_PYTHON_URL "https://natron.readthedocs.org/en/workshop/"
+#define NATRON_PYTHON_URL "https://natron.readthedocs.org/en/master/"
 #define NATRON_WIKI_URL "https://github.com/MrKepzie/Natron/wiki"
 #define NATRON_ISSUE_TRACKER_URL "https://github.com/MrKepzie/Natron/issues"
 // The MIME types for Natron documents are:
@@ -107,7 +107,7 @@ namespace NATRON_NAMESPACE { }
 #define NATRON_VERSION_REVISION 0
 
 
-#define NATRON_LAST_VERSION_URL "https://raw.githubusercontent.com/MrKepzie/Natron/workshop/LATEST_VERSION.txt"
+#define NATRON_LAST_VERSION_URL "https://raw.githubusercontent.com/MrKepzie/Natron/master/LATEST_VERSION.txt"
 #define NATRON_LAST_VERSION_FILE_VERSION 1
 
 // homemade builds should always show "Devel"

Gui/Resources/PyPlugs/AngleBlur.py

@@ -3,7 +3,7 @@
 # This file was automatically generated by Natron PyPlug exporter version 3.
 
 # Hand-written code should be added in a separate file named AngleBlurExt.py
-# See http://natron.readthedocs.org/en/workshop/groups.html#adding-hand-written-code-callbacks-etc
+# See http://natron.readthedocs.org/en/master/groups.html#adding-hand-written-code-callbacks-etc
 # Note that Viewers are never exported
 
 import NatronEngine

Gui/Resources/PyPlugs/DropShadow.py

@@ -3,7 +3,7 @@
 # This file was automatically generated by Natron PyPlug exporter version 3.
 
 # Hand-written code should be added in a separate file named DropShadowExt.py
-# See http://natron.readthedocs.org/en/workshop/groups.html#adding-hand-written-code-callbacks-etc
+# See http://natron.readthedocs.org/en/master/groups.html#adding-hand-written-code-callbacks-etc
 # Note that Viewers are never exported
 
 import NatronEngine

Gui/Resources/PyPlugs/Fill.py

@@ -3,7 +3,7 @@
 # This file was automatically generated by Natron PyPlug exporter version 3.
 
 # Hand-written code should be added in a separate file named FillExt.py
-# See http://natron.readthedocs.org/en/workshop/groups.html#adding-hand-written-code-callbacks-etc
+# See http://natron.readthedocs.org/en/master/groups.html#adding-hand-written-code-callbacks-etc
 # Note that Viewers are never exported
 
 import NatronEngine

Gui/Resources/PyPlugs/Glow.py

@@ -3,7 +3,7 @@
 # This file was automatically generated by Natron PyPlug exporter version 7.
 
 # Hand-written code should be added in a separate file named GlowExt.py
-# See http://natron.readthedocs.org/en/workshop/groups.html#adding-hand-written-code-callbacks-etc
+# See http://natron.readthedocs.org/en/master/groups.html#adding-hand-written-code-callbacks-etc
 # Note that Viewers are never exported
 
 import NatronEngine

Gui/Resources/PyPlugs/LightWrap.py

@@ -3,7 +3,7 @@
 # This file was automatically generated by Natron PyPlug exporter version 5.
 
 # Hand-written code should be added in a separate file named LightWrapExt.py
-# See http://natron.readthedocs.org/en/workshop/groups.html#adding-hand-written-code-callbacks-etc
+# See http://natron.readthedocs.org/en/master/groups.html#adding-hand-written-code-callbacks-etc
 # Note that Viewers are never exported
 
 import NatronEngine

Gui/Resources/PyPlugs/ZMask.py

@@ -3,7 +3,7 @@
 # This file was automatically generated by Natron PyPlug exporter version 3.
 
 # Hand-written code should be added in a separate file named ZMaskExt.py
-# See http://natron.readthedocs.org/en/workshop/groups.html#adding-hand-written-code-callbacks-etc
+# See http://natron.readthedocs.org/en/master/groups.html#adding-hand-written-code-callbacks-etc
 # Note that Viewers are never exported
 
 import NatronEngine

Gui/Resources/PyPlugs/ZRemap.py

@@ -3,7 +3,7 @@
 # This file was automatically generated by Natron PyPlug exporter version 3.
 
 # Hand-written code should be added in a separate file named ZRemapExt.py
-# See http://natron.readthedocs.org/en/workshop/groups.html#adding-hand-written-code-callbacks-etc
+# See http://natron.readthedocs.org/en/master/groups.html#adding-hand-written-code-callbacks-etc
 # Note that Viewers are never exported
 
 import NatronEngine

INSTALL_LINUX.md

@@ -322,7 +322,7 @@ export PYTHON_PATH=$INSTALL_PATH/lib/python2.7
 export PYTHON_INCLUDE=$INSTALL_PATH/include/python2.7
 
 cd Natron
-wget https://raw.githubusercontent.com/MrKepzie/Natron/workshop/tools/linux/include/natron/config.pri
+wget https://raw.githubusercontent.com/MrKepzie/Natron/master/tools/linux/include/natron/config.pri
 mkdir build && cd build
 $INSTALL_PATH/bin/qmake -r CONFIG+=release ../Project.pro
 make || exit 1

INSTALL_OSX.md

@@ -8,10 +8,10 @@ This file is supposed to guide you step by step to have working (compiling) vers
 	git clone https://github.com/MrKepzie/Natron.git
 	cd Natron
 
-If you want to compile the bleeding edge version, use the workshop
+If you want to compile the bleeding edge version, use the master
 branch:
 
-	git checkout workshop
+	git checkout master
 
 Update the submodules:
 
@@ -310,7 +310,7 @@ Shiboken has a few glitches which needs fixing with some sed commands, run tools
 
 ## OpenFX plugins
 
-Instructions to build the [openfx-io](https://github.com/MrKepzie/openfx-io) and [openfx-misc](https://github.com/devernay/openfx-misc) sets of plugins can also be found in the [tools/packageOSX.sh](https://github.com/MrKepzie/Natron/blob/workshop/tools/packageOSX.sh) script if you are using MacPorts, or in the .travis.yml file in their respective github repositories if you are using homebrew ([openfx-misc/.travis.yml](https://github.com/devernay/openfx-misc/blob/master/.travis.yml), [openfx-io/.travis.yml](https://github.com/MrKepzie/openfx-io/blob/master/.travis.yml).
+Instructions to build the [openfx-io](https://github.com/MrKepzie/openfx-io) and [openfx-misc](https://github.com/devernay/openfx-misc) sets of plugins can also be found in the [tools/packageOSX.sh](https://github.com/MrKepzie/Natron/blob/master/tools/packageOSX.sh) script if you are using MacPorts, or in the .travis.yml file in their respective github repositories if you are using homebrew ([openfx-misc/.travis.yml](https://github.com/devernay/openfx-misc/blob/master/.travis.yml), [openfx-io/.travis.yml](https://github.com/MrKepzie/openfx-io/blob/master/.travis.yml).
 
 
 You can install [TuttleOFX](http://www.tuttleofx.org/) using homebrew:

README.md

@@ -1,4 +1,4 @@
-Natron [![Build Status](https://api.travis-ci.org/MrKepzie/Natron.png?branch=workshop)](https://travis-ci.org/MrKepzie/Natron)  [![Coverage Status](https://coveralls.io/repos/MrKepzie/Natron/badge.png?branch=workshop)](https://coveralls.io/r/MrKepzie/Natron?branch=workshop) [![Coverity Scan Build Status](https://scan.coverity.com/projects/2940/badge.svg)](https://scan.coverity.com/projects/2940 "Coverity Badge") [![Documentation Status](https://readthedocs.org/projects/natron/badge/?version=workshop)](https://readthedocs.org/projects/natron/?badge=workshop)
+Natron [![Build Status](https://api.travis-ci.org/MrKepzie/Natron.png?branch=master)](https://travis-ci.org/MrKepzie/Natron)  [![Coverage Status](https://coveralls.io/repos/MrKepzie/Natron/badge.png?branch=master)](https://coveralls.io/r/MrKepzie/Natron?branch=master) [![Coverity Scan Build Status](https://scan.coverity.com/projects/2940/badge.svg)](https://scan.coverity.com/projects/2940 "Coverity Badge") [![Documentation Status](https://readthedocs.org/projects/natron/badge/?version=master)](https://readthedocs.org/projects/natron/?badge=master)
 
 ======
 
@@ -169,8 +169,8 @@ We coordinate development through the [GitHub issue
 tracker](https://github.com/MrKepzie/Natron/issues).
 
 The main development branch is called
-["workshop"](https://github.com/MrKepzie/Natron/tree/workshop).
-The master branch contains the last known stable version.
+["master"](https://github.com/MrKepzie/Natron/tree/master).
+The stable version is on branch RB-2.0.
 
 Additionally each stable release supported has a branch on its own.
 For example the stable release of the v1.0. and all its bug fixes should go into that
@@ -182,8 +182,8 @@ You can check out the easy tasks left to do [here](https://natron.fr/easy-task-l
 
 Feel free to report bugs, discuss tasks, or pick up work there. If you want to make
 changes, please fork, edit, and [send us a pull
-request](https://github.com/MrKepzie/Natron/pull/new/workshop),
-preferably on the ["workshop"](https://github.com/MrKepzie/Natron/tree/workshop)
+request](https://github.com/MrKepzie/Natron/pull/new/master),
+preferably on the ["master"](https://github.com/MrKepzie/Natron/tree/master)
 branch.
 
 There's a `.git-hooks` directory in the root. This contains a `pre-commit`

tools/MacOSX/README.md

@@ -153,7 +153,7 @@ cd Natron/tools/MacOSX
 env BUILD_CONFIG=STABLE BUILD_NUMBER=1 CONFIG=relwithdebinfo BRANCH=tag  MKJOBS=4 UPLOAD=1 ./build.sh
 ```
 
-The server will now auto build from the workshop branch on changes.
+The server will now auto build from the master branch on changes.
 
 ## Google-breakpad
 

tools/MacOSX/build-natron.sh

@@ -23,7 +23,7 @@
 # MKJOBS: Number of threads
 # CONFIG=(debug,release,relwithdebinfo): the build type
 # DISABLE_BREAKPAD=1: When set, automatic crash reporting (google-breakpad support) will be disabled
-#Usage MKJOBS=4 BUILD_CONFIG=SNAPSHOT CONFIG=relwithdebinfo BRANCH=workshop PLUGINDIR="..."  ./build-natron.sh
+#Usage MKJOBS=4 BUILD_CONFIG=SNAPSHOT CONFIG=relwithdebinfo BRANCH=master PLUGINDIR="..."  ./build-natron.sh
 
 source `pwd`/common.sh || exit 1
 MACPORTS="/opt/local"
@@ -32,7 +32,7 @@ QTDIR="${MACPORTS}/libexec/qt4"
 cd "$CWD/build" || exit 1
 
 
-if [ "$BRANCH" = "workshop" ]; then
+if [ "$BRANCH" = "master" ]; then
     NATRON_BRANCH=$BRANCH
     IO_BRANCH=master
     MISC_BRANCH=master
@@ -51,7 +51,7 @@ git checkout $NATRON_BRANCH || exit 1
 git pull origin $NATRON_BRANCH
 git submodule update -i --recursive || exit 1
 
-if [ "$BRANCH" = "workshop" ]; then
+if [ "$BRANCH" = "master" ]; then
     # the snapshots are always built with the latest version of submodules
     git submodule foreach git pull origin master
 fi

tools/MacOSX/build-plugins.sh

@@ -21,14 +21,14 @@
 # CONFIG=(debug,release,relwithdebinfo): the build type
 # DISABLE_BREAKPAD=1: When set, automatic crash reporting (google-breakpad support) will be disabled
 # PLUGINDIR: The path to the plug-ins in the final bundle, e.g: "$CWD/build/Natron/App/Natron.app/Contents/Plugins"
-#Usage PLUGINDIR="..." MKJOBS=4 CONFIG=relwithdebinfo BRANCH=workshop ./build-plugins.sh
+#Usage PLUGINDIR="..." MKJOBS=4 CONFIG=relwithdebinfo BRANCH=master ./build-plugins.sh
 
 source `pwd`/common.sh || exit 1
 
 cd $CWD/build || exit 1
 
-#If "workshop" is passed, use master branch for all plug-ins otherwise use the git tags in common.sh
-if [ "$BRANCH" = "workshop" ]; then
+#If "master" is passed, use master branch for all plug-ins otherwise use the git tags in common.sh
+if [ "$BRANCH" = "master" ]; then
     IO_BRANCH=master
     MISC_BRANCH=master
     ARENA_BRANCH=master

tools/MacOSX/build.sh

@@ -19,15 +19,15 @@
 
 # Options:
 # CONFIG=(debug,release,relwithdebinfo): the build type
-# BRANCH=(workhop,tag): If workshop, builds dev branch, otherwise uses tags from common.sh
+# BRANCH=(workhop,tag): If master, builds dev branch, otherwise uses tags from common.sh
 # MKJOBS=N: number of threads
 # NO_CLEAN=1: Do not remove build dir before building, useful for debugging and avoiding the cloning etc...
 # BUILD_CONFIG=(SNAPSHOT,ALPHA,BETA,RC,STABLE,CUSTOM)
 # CUSTOM_BUILD_USER_NAME="Toto" : to be set if BUILD_CONFIG=CUSTOM
 # BUILD_NUMBER=X: To be set to indicate the revision number of the build. For example RC1,RC2, RC3 etc...
 # DISABLE_BREAKPAD=1: When set, automatic crash reporting (google-breakpad support) will be disabled
 
-#Usage: BUILD_CONFIG=STABLE BUILD_NUMBER=1 CONFIG=release BRANCH=workshop MKJOBS=4 UPLOAD=1 ./build.sh
+#Usage: BUILD_CONFIG=STABLE BUILD_NUMBER=1 CONFIG=release BRANCH=master MKJOBS=4 UPLOAD=1 ./build.sh
 
 source `pwd`/common.sh || exit 1
 (cd ports; portindex)

tools/MacOSX/snapshot.sh

@@ -28,12 +28,12 @@ if [ ! -d $TMP ];then
     mkdir -p $TMP || exit 1
 fi
 
-#clone repos to get git version to check against NATRON_WORKSHOP
+#clone repos to get git version to check against NATRON_MASTER
 if [ ! -d $TMP/Natron ];then
     cd $TMP || exit 1
     git clone $GIT_NATRON || exit 1
     cd Natron || exit 1
-    git checkout workshop || exit 1
+    git checkout master || exit 1
 fi
 
 if [ ! -d $TMP/openfx-io ];then
@@ -73,7 +73,7 @@ while true; do
     source $CWD/commits-hash.sh || exit 1
 
     #Sync all scripts except snapshot.sh in case modifs were made
-    git pull origin workshop
+    git pull origin master
 
     FAIL=0
 
@@ -83,7 +83,7 @@ while true; do
 
     cd $TMP/Natron
     git fetch || FAIL=1
-    git merge origin/workshop || FAIL=1
+    git merge origin/master || FAIL=1
     GITV_NATRON=`git log|head -1|awk '{print $2}'`
     ORIG_NATRON=$NATRON_DEVEL_GIT
     echo "Natron $GITV_NATRON vs. $ORIG_NATRON"
@@ -141,7 +141,7 @@ while true; do
     cd $CWD || FAIL=1
     if [ "$FAIL" != 1 ]; then
         if [ "$BUILD_NATRON" = "1" -o "$BUILD_IO" = "1" -o "$BUILD_MISC" = "1" -o "$BUILD_ARENA" = "1" ]; then
-            env CONFIG=relwithdebinfo BRANCH=workshop BUILD_CONFIG=SNAPSHOT MKJOBS=$MKJOBS UPLOAD=1 NO_CLEAN=$NO_CLEAN ./build.sh || FAIL=1
+            env CONFIG=relwithdebinfo BRANCH=master BUILD_CONFIG=SNAPSHOT MKJOBS=$MKJOBS UPLOAD=1 NO_CLEAN=$NO_CLEAN ./build.sh || FAIL=1
             echo $FAIL
         fi
     fi

tools/Windows/build.sh

@@ -53,7 +53,7 @@ else
     INSTALL_PATH=$INSTALL64_PATH
 fi
 
-if [ "$2" = "workshop" ]; then
+if [ "$2" = "master" ]; then
     BRANCH=$2
     REPO_SUFFIX=snapshot
 	NO_ZIP=1
@@ -172,7 +172,7 @@ $KILLSCRIPT $PID &
 KILLBOT=$!
 
 if [ "$SYNC" = "1" ]; then
-    if [ "$BRANCH" = "workshop" ]; then
+    if [ "$BRANCH" = "master" ]; then
         ONLINE_REPO_BRANCH=snapshots
     else
         ONLINE_REPO_BRANCH=releases

tools/Windows/common.sh

@@ -141,7 +141,7 @@ FFMPEG_MXE_BIN_32_GPL_TAR=ffmpeg-2.8.3-windows-i686-shared-GPLv2.tar.xz
 FFMPEG_MXE_BIN_64_LGPL_TAR=ffmpeg-2.8.3-windows-x86_64-shared-LGPL.tar.xz
 FFMPEG_MXE_BIN_32_LGPL_TAR=ffmpeg-2.8.3-windows-i686-shared-LGPL.tar.xz
 
-NATRON_API_DOC=https://media.readthedocs.org/pdf/natron/workshop/natron.pdf # TODO generate own
+NATRON_API_DOC=https://media.readthedocs.org/pdf/natron/master/natron.pdf # TODO generate own
 
 # Threads
 #

tools/Windows/include/scripts/build-installer.sh

@@ -12,7 +12,7 @@
 # OFFLINE=1 : Make the offline installer too
 # NO_INSTALLER: Do not make any installer, only zip if NO_ZIP!=1
 # Usage:
-# NO_ZIP=1 NATRON_LICENSE=GPL OFFLINE=1 BUILD_CONFIG=BETA BUILD_NUMBER=1 sh build-installer 64 workshop
+# NO_ZIP=1 NATRON_LICENSE=GPL OFFLINE=1 BUILD_CONFIG=BETA BUILD_NUMBER=1 sh build-installer 64 master
 
 source `pwd`/common.sh || exit 1
 source `pwd`/commits-hash.sh || exit 1

tools/Windows/include/scripts/build-natron.sh

@@ -84,7 +84,7 @@ cd Natron || exit 1
 git checkout $NATRON_BRANCH || exit 1
 git pull origin $NATRON_BRANCH
 git submodule update -i --recursive || exit 1
-if [ "$NATRON_BRANCH" = "workshop" ]; then
+if [ "$NATRON_BRANCH" = "master" ]; then
     # the snapshots are always built with the latest version of submodules
     git submodule foreach git pull origin master
 fi

tools/Windows/include/scripts/build-plugins.sh

@@ -39,13 +39,13 @@ fi
 EOF
 chmod +x $KILLSCRIPT
 
-#If "workshop" is passed, use master branch for all plug-ins otherwise use the git tags in common.sh
+#If "master" is passed, use master branch for all plug-ins otherwise use the git tags in common.sh
 IO_BRANCH=master
 MISC_BRANCH=master
 ARENA_BRANCH=master
 CV_BRANCH=master
 
-if [ "$2" != "workshop" ]; then
+if [ "$2" != "master" ]; then
   IO_BRANCH=$IOPLUG_GIT_TAG
   MISC_BRANCH=$MISCPLUG_GIT_TAG
   ARENA_V=$ARENAPLUG_GIT_TAG