Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 10:28:28 +0000 (20:28 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 10:28:28 +0000 (20:28 +1000)
1  2 
GNUmakefile

diff --combined GNUmakefile
index 6485e90ea749aeb30e036a955b127e65227b1e51,26d931ae66491915fe772886bf2350ae79b8288e..4b90e07cda68516ff8414bf4e7cbe4472215ba6f
@@@ -92,7 -92,7 +92,7 @@@ endi
  # -----------------------------------------------------------------------------
  # Blender binary path
  
- ifeq ($(OS), darwin)
+ ifeq ($(OS), Darwin)
        BLENDER_BIN="$(BUILD_DIR)/bin/blender.app/Contents/MacOS/blender"
  else
        BLENDER_BIN="$(BUILD_DIR)/bin/blender"
@@@ -226,12 -226,12 +226,12 @@@ help: .FORC
        @echo "                         which are tagged to use the stricter formatting"
        @echo "  * test_deprecated    - checks for deprecation tags in our code which may need to be removed"
        @echo "  * test_style_c       - checks C/C++ conforms with blenders style guide:"
 -      @echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 +      @echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
        @echo "  * test_style_c_qtc   - same as test_style but outputs QtCreator tasks format"
        @echo "  * test_style_osl     - checks OpenShadingLanguage conforms with blenders style guide:"
 -      @echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 +      @echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
        @echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide:"
 -      @echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 +      @echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
        @echo ""
        @echo "Static Source Code Checking (not associated with building blender)"
        @echo "  * check_cppcheck       - run blender source through cppcheck (C & C++)"
        @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."
@@@ -438,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=$(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) ; \
@@@ -465,7 -458,7 +465,7 @@@ doc_py: .FORC
        $(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