Merge branch 'master' into blender2.8
[blender.git] / GNUmakefile
index 049040f29dd92fc136fde9a235749bfee3223b6c..c1be177ddc0908b76c981e5d018cbea49b7055a6 100644 (file)
@@ -239,8 +239,11 @@ help: .FORCE
        @echo "  * icons    - Updates PNG icons from SVG files."
        @echo "               Set environment variables 'BLENDER_BIN' and 'INKSCAPE_BIN'"
        @echo "               to define your own commands."
        @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."
        @echo ""
        @echo "Environment Variables"
        @echo "  * BUILD_CMAKE_ARGS    - arguments passed to CMake."
@@ -425,6 +428,10 @@ icons: .FORCE
        "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
        "$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
 
        "$(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) ; \
 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) ; \