[Bf-blender-cvs] [5e2804a40be] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 5e2804a40be649e55a827b08d3c424001be43006
Author: Campbell Barton
Date:   Fri Jul 13 18:18:35 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5e2804a40be649e55a827b08d3c424001be43006

Merge branch 'master' into blender2.8

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



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

diff --cc GNUmakefile
index 01806b53e61,049040f29dd..c1be177ddc0
--- a/GNUmakefile
+++ b/GNUmakefile
@@@ -236,10 -236,11 +236,14 @@@ help: .FORC
  	@echo "  * check_descriptions   - check for duplicate/invalid descriptions"
  	@echo ""
  	@echo "Utilities (not associated with building blender)"
- 	@echo "  * icons      - updates PNG icons from SVG files."
- 	@echo "  * icons_geom - updates Geometry icons from BLEND file."
+ 	@echo "  * icons    - Updates PNG icons from SVG files."
+ 	@echo "               Set environment variables 'BLENDER_BIN' and 'INKSCAPE_BIN'"
+ 	@echo "               to define your own commands."
 -	@echo "  * tgz      - create a compressed archive of the source code."
 -	@echo "  * update   - updates git and all submodules"
++	@echo "  * icons_geom - Updates Geometry icons from BLEND file."
++	@echo "                 Set environment variable 'BLENDER_BIN'"
++	@echo "                 to define your own command."
 +	@echo "  * tgz        - create a compressed archive of the source code."
 +	@echo "  * update     - updates git and all submodules"
  	@echo ""
  	@echo "Environment Variables"
  	@echo "  * BUILD_CMAKE_ARGS    - arguments passed to CMake."