Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 25 Apr 2018 07:31:25 +0000 (09:31 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 25 Apr 2018 07:31:25 +0000 (09:31 +0200)
1  2 
GNUmakefile
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_unix.cmake

diff --cc GNUmakefile
index 3817e6b3e5cff620c7ea22f038237c25c39b5bf2,23903d36e63b82be3d9560cd256292742dc5d24e..01806b53e612a291017c39c72f25e5c473a40313
@@@ -424,12 -423,8 +424,12 @@@ 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 \
+       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) ; \
        fi
        if [ -d "../lib" ]; then \
Simple merge