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

[Dilith Jayakody]

Commit: d0ade3c819b3f7f96fd9f3cd0b9af63faa066c4e
Author: Dilith Jayakody
Date:   Fri Jan 28 19:44:42 2022 +0530
Branches: soc-2021-curves
https://developer.blender.org/rBd0ade3c819b3f7f96fd9f3cd0b9af63faa066c4e

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 7f5d0ab6beb,67f1fbca148..00000000000
deleted file mode 160000,160000
--- a/release/scripts/addons
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- Subproject commit 7f5d0ab6beb397051c55c737f601d33bbdbc239d
 -Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230