[Bf-blender-cvs] [0588b2e2294] soc-2021-curves: Merge branch 'master' into soc-2021-curves

[Dilith Jayakody]

Commit: 0588b2e2294def6f9c5ca0aadb70c189f75198d4
Author: Dilith Jayakody
Date:   Fri Feb 4 22:56:10 2022 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB0588b2e2294def6f9c5ca0aadb70c189f75198d4

Merge branch 'master' into soc-2021-curves

===================================================================



===================================================================

diff --cc .gitmodules
index a8f3a3f80ab,a8f3a3f80ab..a965911e90f
--- a/.gitmodules
+++ b/.gitmodules
@@@ -1,8 -1,8 +1,3 @@@
--[submodule "release/scripts/addons"]
--	path = release/scripts/addons
--	url = ../blender-addons.git
--	branch = master
--	ignore = all
  [submodule "release/scripts/addons_contrib"]
  	path = release/scripts/addons_contrib
  	url = ../blender-addons-contrib.git
diff --cc release/scripts/addons
index 9207696bbfa,faa9fc7f98e..00000000000
deleted file mode 160000,160000
--- a/release/scripts/addons
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- Subproject commit 9207696bbfac648c299f29f031ab5f18d8fa0077
 -Subproject commit faa9fc7f98e19be54a715c24061185b04dff5b6c