Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 09:22:59 +0000 (19:22 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 09:25:49 +0000 (19:25 +1000)
1  2 
GNUmakefile

diff --cc GNUmakefile
@@@ -428,10 -435,6 +438,10 @@@ icons: .FORC
        "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
        "$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
  
-       BLENDER_BIN="$(BUILD_DIR)/bin/blender" \
 +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) ; \
  
  # 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