Update references to the new projects platform and main branch

.github/pull_request_template.md

@@ -1,5 +1,5 @@
 This repository is only used as a mirror of git.blender.org. Blender development happens on
-https://developer.blender.org.
+https://projects.blender.org.
 
 To get started with contributing code, please see:
 https://wiki.blender.org/wiki/Process/Contributing_Code

README.md

@@ -24,7 +24,7 @@ Development
 -----------
 
 - [Build Instructions](https://wiki.blender.org/wiki/Building_Blender)
-- [Code Review & Bug Tracker](https://developer.blender.org)
+- [Code Review & Bug Tracker](https://projects.blender.org)
 - [Developer Forum](https://devtalk.blender.org)
 - [Developer Documentation](https://wiki.blender.org)
 

build_files/cmake/buildinfo.cmake

@@ -23,19 +23,19 @@ if(EXISTS ${SOURCE_DIR}/.git)
 
   if(MY_WC_BRANCH STREQUAL "HEAD")
     # Detached HEAD, check whether commit hash is reachable
-    # in the master branch
+    # in the main branch
     execute_process(COMMAND git rev-parse --short=12 HEAD
                     WORKING_DIRECTORY ${SOURCE_DIR}
                     OUTPUT_VARIABLE MY_WC_HASH
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    execute_process(COMMAND git branch --list master blender-v* --contains ${MY_WC_HASH}
+    execute_process(COMMAND git branch --list main blender-v* --contains ${MY_WC_HASH}
                     WORKING_DIRECTORY ${SOURCE_DIR}
                     OUTPUT_VARIABLE _git_contains_check
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     if(NOT _git_contains_check STREQUAL "")
-      set(MY_WC_BRANCH "master")
+      set(MY_WC_BRANCH "main")
     else()
       execute_process(COMMAND git show-ref --tags -d
                       WORKING_DIRECTORY ${SOURCE_DIR}
@@ -48,7 +48,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
                       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
       if(_git_tag_hashes MATCHES "${_git_head_hash}")
-        set(MY_WC_BRANCH "master")
+        set(MY_WC_BRANCH "main")
       else()
         execute_process(COMMAND git branch --contains ${MY_WC_HASH}
                         WORKING_DIRECTORY ${SOURCE_DIR}

build_files/cmake/example_scripts/cmake_linux_install.sh

@@ -14,8 +14,8 @@ cd ~/blender-git
 git clone http://git.blender.org/blender.git
 cd blender
 git submodule update --init --recursive
-git submodule foreach git checkout master
+git submodule foreach git checkout main
-git submodule foreach git pull --rebase origin master
+git submodule foreach git pull --rebase origin main
 
 # create build dir
 mkdir ~/blender-git/build-cmake
@@ -35,7 +35,7 @@ ln -s ~/blender-git/build-cmake/bin/blender ~/blender-git/blender/blender.bin
 echo ""
 echo "* Useful Commands *"
 echo "   Run Blender: ~/blender-git/blender/blender.bin"
-echo "   Update Blender: git pull --rebase; git submodule foreach git pull --rebase origin master"
+echo "   Update Blender: git pull --rebase; git submodule foreach git pull --rebase origin main"
 echo "   Reconfigure Blender: cd ~/blender-git/build-cmake ; cmake ."
 echo "   Build Blender: cd ~/blender-git/build-cmake ; make"
 echo ""

build_files/config/pipeline_config.yaml

@@ -5,16 +5,16 @@
 update-code:
     git:
         submodules:
-        -   branch: master
+        -   branch: main
             commit_id: HEAD
             path: release/scripts/addons
-        -   branch: master
+        -   branch: main
             commit_id: HEAD
             path: release/scripts/addons_contrib
-        -   branch: master
+        -   branch: main
             commit_id: HEAD
             path: release/datafiles/locale
-        -   branch: master
+        -   branch: main
             commit_id: HEAD
             path: source/tools
     svn:

build_files/utils/make_update.py

@@ -202,8 +202,8 @@ def submodules_update(
         sys.exit(1)
 
     # Update submodules to appropriate given branch,
-    # falling back to master if none is given and/or found in a sub-repository.
+    # falling back to main if none is given and/or found in a sub-repository.
-    branch_fallback = "master"
+    branch_fallback = "main"
     if not branch:
         branch = branch_fallback
 

build_files/windows/check_submodules.cmd

@@ -3,9 +3,9 @@ if NOT exist "%BLENDER_DIR%\source\tools\.git" (
 	if not "%GIT%" == "" (
 		"%GIT%" submodule update --init --recursive --progress
 		if errorlevel 1 goto FAIL
-		"%GIT%" submodule foreach git checkout master
+		"%GIT%" submodule foreach git checkout main
 		if errorlevel 1 goto FAIL
-		"%GIT%" submodule foreach git pull --rebase origin master
+		"%GIT%" submodule foreach git pull --rebase origin main
 		if errorlevel 1 goto FAIL
 		goto EOF
 	) else (

doc/python_api/sphinx_doc_gen.py

@@ -1816,9 +1816,9 @@ def pyrna2sphinx(basepath):
 
     # operators
     def write_ops():
-        API_BASEURL = "https://developer.blender.org/diffusion/B/browse/master/release/scripts"
+        API_BASEURL = "https://projects.blender.org/blender/blender/src/branch/main/release/scripts"
-        API_BASEURL_ADDON = "https://developer.blender.org/diffusion/BA"
+        API_BASEURL_ADDON = "https://projects.blender.org/blender/blender-addons"
-        API_BASEURL_ADDON_CONTRIB = "https://developer.blender.org/diffusion/BAC"
+        API_BASEURL_ADDON_CONTRIB = "https://projects.blender.org/blender/blender-addons-contrib"
 
         op_modules = {}
         op = None

doc/python_api/static/js/version_switch.js

@@ -156,7 +156,7 @@ var Popover = function() {
     },
     getNamed : function(v) {
       $.each(all_versions, function(ix, title) {
-        if (ix === "master" || ix === "latest") {
+        if (ix === "master" || ix === "main" || ix === "latest") {
           var m = title.match(/\d\.\d[\w\d\.]*/)[0];
           if (parseFloat(m) == v) {
             v = ix;

intern/libmv/bundle.sh

@@ -8,7 +8,7 @@ else
   exit 1
 fi
 
-BRANCH="master"
+BRANCH="main"
 
 # repo="git://git.blender.org/libmv.git"
 repo="/home/sergey/Developer/libmv"

release/text/readme.html

@@ -96,8 +96,8 @@ Chat <a href="https://blender.chat/channel/today">
 <p class="p5">
 <span class="s3">Development <a href="https://www.blender.org/get-involved/developers/">
 <span class="s4">www.blender.org/get-involved/developers/</span></a><br>
-GIT and Bug Tracker <a href="https://developer.blender.org/">
+GIT and Bug Tracker <a href="https://projects.blender.org/">
-<span class="s4">developer.blender.org</span></a><br>
+<span class="s4">projects.blender.org</span></a><br>
 Chat <a href="https://blender.chat/channel/blender-coders">
 <span class="s4">#blender-coders</span></a> on blender.chat</span>
 </p>

release/windows/batch/blender_debug_gpu.cmd

@@ -3,7 +3,7 @@ echo Starting blender with GPU debugging options, log files will be created
 echo in your temp folder, windows explorer will open after you close blender
 echo to help you find them.
 echo.
-echo If you report a bug on https://developer.blender.org you can attach these files
+echo If you report a bug on https://projects.blender.org you can attach these files
 echo by dragging them into the text area of your bug report, please include both
 echo blender_debug_output.txt and blender_system_info.txt in your report. 
 echo.

release/windows/batch/blender_debug_gpu_glitchworkaround.cmd

@@ -3,7 +3,7 @@ echo Starting blender with GPU debugging and glitch workaround options, log file
 echo will be created in your temp folder, windows explorer will open after you 
 echo close blender to help you find them.
 echo.
-echo If you report a bug on https://developer.blender.org you can attach these files
+echo If you report a bug on https://projects.blender.org you can attach these files
 echo by dragging them into the text area of your bug report, please include both
 echo blender_debug_output.txt and blender_system_info.txt in your report. 
 echo.

release/windows/batch/blender_debug_log.cmd

@@ -3,7 +3,7 @@ echo Starting blender with debug logging options, log files will be created
 echo in your temp folder, windows explorer will open after you close blender
 echo to help you find them.
 echo.
-echo If you report a bug on https://developer.blender.org you can attach these files
+echo If you report a bug on https://projects.blender.org you can attach these files
 echo by dragging them into the text area of your bug report, please include both
 echo blender_debug_output.txt and blender_system_info.txt in your report. 
 echo.

release/windows/batch/blender_factory_startup.cmd

@@ -3,7 +3,7 @@ echo Starting blender with factory settings, log files will be created
 echo in your temp folder, windows explorer will open after you close blender
 echo to help you find them.
 echo.
-echo If you report a bug on https://developer.blender.org you can attach these files
+echo If you report a bug on https://projects.blender.org you can attach these files
 echo by dragging them into the text area of your bug report, please include both
 echo blender_debug_output.txt and blender_system_info.txt in your report. 
 echo.

tests/performance/api/config.py

@@ -150,7 +150,7 @@ class TestConfig:
         default_config += """tests = ['*']\n"""
         default_config += """categories = ['*']\n"""
         default_config += """builds = {\n"""
-        default_config += """    'master': '/home/user/blender-git/build/bin/blender',"""
+        default_config += """    'main': '/home/user/blender-git/build/bin/blender',"""
         default_config += """    '2.93': '/home/user/blender-2.93/blender',"""
         default_config += """}\n"""
         default_config += """revisions = {\n"""