[Bf-blender-cvs] [5884c9f1ba4] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 5884c9f1ba45b8285930508b8ee04279a7b0b387
Author: Sergey Sharybin
Date:   Mon Apr 3 15:15:56 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB5884c9f1ba45b8285930508b8ee04279a7b0b387

Merge branch 'master' into blender2.8

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



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

diff --cc .gitmodules
index 02875320630,2f52bfce372..11ce247b455
--- a/.gitmodules
+++ b/.gitmodules
@@@ -1,20 -1,20 +1,24 @@@
  [submodule "release/scripts/addons"]
  	path = release/scripts/addons
  	url = ../blender-addons.git
 +	branch = blender2.8
  	ignore = all
+ 	branch = master
  [submodule "release/scripts/addons_contrib"]
  	path = release/scripts/addons_contrib
  	url = ../blender-addons-contrib.git
 +	branch = master
  	ignore = all
+ 	branch = master
  [submodule "release/datafiles/locale"]
  	path = release/datafiles/locale
  	url = ../blender-translations.git
 +	branch = master
  	ignore = all
+ 	branch = master
  [submodule "source/tools"]
  	path = source/tools
  	url = ../blender-dev-tools.git
 +	branch = master
  	ignore = all
+ 	branch = master