[Bf-blender-cvs] [15acbbdc1ec] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 15acbbdc1ecda8d1fe8df8b6bd4d8c4f1d26ae89
Author: Campbell Barton
Date:   Tue Aug 21 19:22:59 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB15acbbdc1ecda8d1fe8df8b6bd4d8c4f1d26ae89

Merge branch 'master' into blender2.8

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



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

diff --cc GNUmakefile
index ad2c265f3a9,2599cb19e3e..6485e90ea74
--- a/GNUmakefile
+++ b/GNUmakefile
@@@ -428,10 -435,6 +438,10 @@@ 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_BIN=$(BLENDER_BIN) \
 +	    "$(BLENDER_DIR)/release/datafiles/blender_icons_geom_update.py"
 +
  update: .FORCE
  	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) ; \
@@@ -452,10 -455,10 +462,10 @@@
  
  # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
  doc_py: .FORCE
- 	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \
+ 	$(BLENDER_BIN) --background -noaudio --factory-startup \
  		--python doc/python_api/sphinx_doc_gen.py
  	cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
 -	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
 +	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
  
  doc_doxy: .FORCE
  	cd doc/doxygen; doxygen Doxyfile