Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 16:18:35 +0000 (18:18 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 16:20:10 +0000 (18:20 +0200)
1  2 
GNUmakefile

diff --combined GNUmakefile
index 01806b53e612a291017c39c72f25e5c473a40313,049040f29dd92fc136fde9a235749bfee3223b6c..c1be177ddc0908b76c981e5d018cbea49b7055a6
@@@ -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."
@@@ -424,10 -425,6 +428,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_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) ; \