[Bf-blender-cvs] [dfd82b18df6] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Dalai Felinto]

Commit: dfd82b18df6b73cd91272f0b66d9fa59815db44c
Author: Dalai Felinto
Date:   Wed Apr 25 09:31:25 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBdfd82b18df6b73cd91272f0b66d9fa59815db44c

Merge remote-tracking branch 'origin/master' into blender2.8

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



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

diff --cc GNUmakefile
index 3817e6b3e5c,23903d36e63..01806b53e61
--- a/GNUmakefile
+++ b/GNUmakefile
@@@ -424,12 -423,8 +424,12 @@@ icons: .FORC
  	"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
  	"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
  
 +icons_geom: .FORCE
 +	BLENDER_BIN="$(BUILD_DIR)/bin/blender" \
 +	    "$(BLENDER_DIR)/release/datafiles/blender_icons_geom_update.py"
 +
  update: .FORCE
- 	if [ "$(OS_NCASE)" == "darwin" ] && [ ! -d "../lib/$(OS_NCASE)" ]; then \
+ 	if [ "$(OS_NCASE)" = "darwin" ] && [ ! -d "../lib/$(OS_NCASE)" ]; then \
  		svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/$(OS_NCASE) ../lib/$(OS_NCASE) ; \
  	fi
  	if [ -d "../lib" ]; then \