moved textures folder outside distrib

cnr-isti-vclab · Apr 21, 2020 · 8e2d291 · 8e2d291
1 parent d287465
commit 8e2d291
Show file tree

Hide file tree

Showing 69 changed files with 1 addition and 3 deletions.
diff --git a/distrib/README.md b/distrib/README.md
@@ -1,6 +1,6 @@
 # distrib folder
 
-The distrib folder contains a set of pre-built libraries, plugins, shaders and textures that MeshLab needs to properly run. 
+The distrib folder contains a set of pre-built libraries, plugins and shaders that MeshLab needs to properly run. 
 
 Running `qmake && make` from the [src](https://github.com/cnr-isti-vclab/meshlab/tree/master/src) folder of the repo, MeshLab binaries, plugins and libraries will be placed automatically in this folder.
 If instead a shadow build is set, the `distrib` folder will be automatically copied inside the selected build directory, and it will contain also binaries, plugins and libraries.

diff --git a/install/linux/linux_appimages.sh b/install/linux/linux_appimages.sh
@@ -60,7 +60,6 @@ mv readme.txt usr/share/doc/meshlab/
 mv lib/libcommon* usr/lib/
 mv plugins/ usr/lib/meshlab/
 mv shaders/ usr/share/meshlab/
-mv textures/ usr/share/meshlab/
 
 export VERSION=$(cat $INSTALL_PATH/../../ML_VERSION)
 

diff --git a/install/linux/linux_deploy.sh b/install/linux/linux_deploy.sh
@@ -59,7 +59,6 @@ mv readme.txt usr/share/doc/meshlab/
 mv lib/libcommon* usr/lib/
 mv plugins/ usr/lib/meshlab/
 mv shaders/ usr/share/meshlab/
-mv textures/ usr/share/meshlab/
 
 $INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab.desktop -bundle-non-qt-libs -executable=usr/bin/meshlabserver
 

diff --git a/distrib/textures/Fur.png → textures/Fur.png b/distrib/textures/Fur.png → textures/Fur.png
diff --git a/distrib/textures/NPR Metallic Outline.png → textures/NPR Metallic Outline.png b/distrib/textures/NPR Metallic Outline.png → textures/NPR Metallic Outline.png
diff --git a/distrib/textures/NPR Metallic Outline.tga → textures/NPR Metallic Outline.tga b/distrib/textures/NPR Metallic Outline.tga → textures/NPR Metallic Outline.tga
diff --git a/distrib/textures/OTS-DiffuseCubeMap.dds → textures/OTS-DiffuseCubeMap.dds b/distrib/textures/OTS-DiffuseCubeMap.dds → textures/OTS-DiffuseCubeMap.dds
diff --git a/distrib/textures/OTS-Phong50CubeMap.dds → textures/OTS-Phong50CubeMap.dds b/distrib/textures/OTS-Phong50CubeMap.dds → textures/OTS-Phong50CubeMap.dds
diff --git a/distrib/textures/base.tga → textures/base.tga b/distrib/textures/base.tga → textures/base.tga
diff --git a/distrib/textures/brickbump.jpg → textures/brickbump.jpg b/distrib/textures/brickbump.jpg → textures/brickbump.jpg
diff --git a/distrib/textures/brickbump.tga → textures/brickbump.tga b/distrib/textures/brickbump.tga → textures/brickbump.tga
diff --git a/distrib/textures/chrome.png → textures/chrome.png b/distrib/textures/chrome.png → textures/chrome.png
diff --git a/.../textures/cubemaps/forest/forest_negx.jpg → textures/cubemaps/forest/forest_negx.jpg b/.../textures/cubemaps/forest/forest_negx.jpg → textures/cubemaps/forest/forest_negx.jpg
diff --git a/.../textures/cubemaps/forest/forest_negy.jpg → textures/cubemaps/forest/forest_negy.jpg b/.../textures/cubemaps/forest/forest_negy.jpg → textures/cubemaps/forest/forest_negy.jpg
diff --git a/.../textures/cubemaps/forest/forest_negz.jpg → textures/cubemaps/forest/forest_negz.jpg b/.../textures/cubemaps/forest/forest_negz.jpg → textures/cubemaps/forest/forest_negz.jpg
diff --git a/.../textures/cubemaps/forest/forest_posx.jpg → textures/cubemaps/forest/forest_posx.jpg b/.../textures/cubemaps/forest/forest_posx.jpg → textures/cubemaps/forest/forest_posx.jpg
diff --git a/.../textures/cubemaps/forest/forest_posy.jpg → textures/cubemaps/forest/forest_posy.jpg b/.../textures/cubemaps/forest/forest_posy.jpg → textures/cubemaps/forest/forest_posy.jpg
diff --git a/.../textures/cubemaps/forest/forest_posz.jpg → textures/cubemaps/forest/forest_posz.jpg b/.../textures/cubemaps/forest/forest_posz.jpg → textures/cubemaps/forest/forest_posz.jpg
diff --git a/distrib/textures/cubemaps/forest/readme.txt → textures/cubemaps/forest/readme.txt b/distrib/textures/cubemaps/forest/readme.txt → textures/cubemaps/forest/readme.txt
diff --git a/distrib/textures/cubemaps/mount_negx.jpg → textures/cubemaps/mount_negx.jpg b/distrib/textures/cubemaps/mount_negx.jpg → textures/cubemaps/mount_negx.jpg
diff --git a/distrib/textures/cubemaps/mount_negy.jpg → textures/cubemaps/mount_negy.jpg b/distrib/textures/cubemaps/mount_negy.jpg → textures/cubemaps/mount_negy.jpg
diff --git a/distrib/textures/cubemaps/mount_negz.jpg → textures/cubemaps/mount_negz.jpg b/distrib/textures/cubemaps/mount_negz.jpg → textures/cubemaps/mount_negz.jpg
diff --git a/distrib/textures/cubemaps/mount_posx.jpg → textures/cubemaps/mount_posx.jpg b/distrib/textures/cubemaps/mount_posx.jpg → textures/cubemaps/mount_posx.jpg
diff --git a/distrib/textures/cubemaps/mount_posy.jpg → textures/cubemaps/mount_posy.jpg b/distrib/textures/cubemaps/mount_posy.jpg → textures/cubemaps/mount_posy.jpg
diff --git a/distrib/textures/cubemaps/mount_posz.jpg → textures/cubemaps/mount_posz.jpg b/distrib/textures/cubemaps/mount_posz.jpg → textures/cubemaps/mount_posz.jpg
diff --git a/distrib/textures/cubemaps/sky_negx.jpg → textures/cubemaps/sky_negx.jpg b/distrib/textures/cubemaps/sky_negx.jpg → textures/cubemaps/sky_negx.jpg
diff --git a/distrib/textures/cubemaps/sky_negy.jpg → textures/cubemaps/sky_negy.jpg b/distrib/textures/cubemaps/sky_negy.jpg → textures/cubemaps/sky_negy.jpg
diff --git a/distrib/textures/cubemaps/sky_negz.jpg → textures/cubemaps/sky_negz.jpg b/distrib/textures/cubemaps/sky_negz.jpg → textures/cubemaps/sky_negz.jpg
diff --git a/distrib/textures/cubemaps/sky_posx.jpg → textures/cubemaps/sky_posx.jpg b/distrib/textures/cubemaps/sky_posx.jpg → textures/cubemaps/sky_posx.jpg
diff --git a/distrib/textures/cubemaps/sky_posy.jpg → textures/cubemaps/sky_posy.jpg b/distrib/textures/cubemaps/sky_posy.jpg → textures/cubemaps/sky_posy.jpg
diff --git a/distrib/textures/cubemaps/sky_posz.jpg → textures/cubemaps/sky_posz.jpg b/distrib/textures/cubemaps/sky_posz.jpg → textures/cubemaps/sky_posz.jpg
diff --git a/distrib/textures/cubemaps/uffizi_negx.jpg → textures/cubemaps/uffizi_negx.jpg b/distrib/textures/cubemaps/uffizi_negx.jpg → textures/cubemaps/uffizi_negx.jpg
diff --git a/distrib/textures/cubemaps/uffizi_negy.jpg → textures/cubemaps/uffizi_negy.jpg b/distrib/textures/cubemaps/uffizi_negy.jpg → textures/cubemaps/uffizi_negy.jpg
diff --git a/distrib/textures/cubemaps/uffizi_negz.jpg → textures/cubemaps/uffizi_negz.jpg b/distrib/textures/cubemaps/uffizi_negz.jpg → textures/cubemaps/uffizi_negz.jpg
diff --git a/distrib/textures/cubemaps/uffizi_posx.jpg → textures/cubemaps/uffizi_posx.jpg b/distrib/textures/cubemaps/uffizi_posx.jpg → textures/cubemaps/uffizi_posx.jpg
diff --git a/distrib/textures/cubemaps/uffizi_posy.jpg → textures/cubemaps/uffizi_posy.jpg b/distrib/textures/cubemaps/uffizi_posy.jpg → textures/cubemaps/uffizi_posy.jpg
diff --git a/distrib/textures/cubemaps/uffizi_posz.jpg → textures/cubemaps/uffizi_posz.jpg b/distrib/textures/cubemaps/uffizi_posz.jpg → textures/cubemaps/uffizi_posz.jpg
diff --git a/distrib/textures/envmap.svg → textures/envmap.svg b/distrib/textures/envmap.svg → textures/envmap.svg
diff --git a/distrib/textures/glyphmosaic.png → textures/glyphmosaic.png b/distrib/textures/glyphmosaic.png → textures/glyphmosaic.png
diff --git a/distrib/textures/hatch0.jpg → textures/hatch0.jpg b/distrib/textures/hatch0.jpg → textures/hatch0.jpg
diff --git a/distrib/textures/hatch1.jpg → textures/hatch1.jpg b/distrib/textures/hatch1.jpg → textures/hatch1.jpg
diff --git a/distrib/textures/hatch2.jpg → textures/hatch2.jpg b/distrib/textures/hatch2.jpg → textures/hatch2.jpg
diff --git a/distrib/textures/hatch3.jpg → textures/hatch3.jpg b/distrib/textures/hatch3.jpg → textures/hatch3.jpg
diff --git a/distrib/textures/hatch4.jpg → textures/hatch4.jpg b/distrib/textures/hatch4.jpg → textures/hatch4.jpg
diff --git a/distrib/textures/hatch5.jpg → textures/hatch5.jpg b/distrib/textures/hatch5.jpg → textures/hatch5.jpg
diff --git a/distrib/textures/litspheres/ls01.png → textures/litspheres/ls01.png b/distrib/textures/litspheres/ls01.png → textures/litspheres/ls01.png
diff --git a/distrib/textures/litspheres/ls02.png → textures/litspheres/ls02.png b/distrib/textures/litspheres/ls02.png → textures/litspheres/ls02.png
diff --git a/distrib/textures/litspheres/mat01.png → textures/litspheres/mat01.png b/distrib/textures/litspheres/mat01.png → textures/litspheres/mat01.png
diff --git a/distrib/textures/litspheres/mat02.png → textures/litspheres/mat02.png b/distrib/textures/litspheres/mat02.png → textures/litspheres/mat02.png
diff --git a/distrib/textures/litspheres/mat03.png → textures/litspheres/mat03.png b/distrib/textures/litspheres/mat03.png → textures/litspheres/mat03.png
diff --git a/distrib/textures/litspheres/mat04.png → textures/litspheres/mat04.png b/distrib/textures/litspheres/mat04.png → textures/litspheres/mat04.png
diff --git a/distrib/textures/litspheres/mat05.png → textures/litspheres/mat05.png b/distrib/textures/litspheres/mat05.png → textures/litspheres/mat05.png
diff --git a/distrib/textures/litspheres/mat06.png → textures/litspheres/mat06.png b/distrib/textures/litspheres/mat06.png → textures/litspheres/mat06.png
diff --git a/distrib/textures/litspheres/mat07.png → textures/litspheres/mat07.png b/distrib/textures/litspheres/mat07.png → textures/litspheres/mat07.png
diff --git a/distrib/textures/litspheres/mat08.png → textures/litspheres/mat08.png b/distrib/textures/litspheres/mat08.png → textures/litspheres/mat08.png
diff --git a/distrib/textures/litspheres/mat09.png → textures/litspheres/mat09.png b/distrib/textures/litspheres/mat09.png → textures/litspheres/mat09.png
diff --git a/distrib/textures/litspheres/mat10.png → textures/litspheres/mat10.png b/distrib/textures/litspheres/mat10.png → textures/litspheres/mat10.png
diff --git a/distrib/textures/litspheres/mat11.png → textures/litspheres/mat11.png b/distrib/textures/litspheres/mat11.png → textures/litspheres/mat11.png
diff --git a/distrib/textures/litspheres/mat12.png → textures/litspheres/mat12.png b/distrib/textures/litspheres/mat12.png → textures/litspheres/mat12.png
diff --git a/distrib/textures/litspheres/mat13.png → textures/litspheres/mat13.png b/distrib/textures/litspheres/mat13.png → textures/litspheres/mat13.png
diff --git a/distrib/textures/litspheres/mat14.png → textures/litspheres/mat14.png b/distrib/textures/litspheres/mat14.png → textures/litspheres/mat14.png
diff --git a/distrib/textures/litspheres/mat15.png → textures/litspheres/mat15.png b/distrib/textures/litspheres/mat15.png → textures/litspheres/mat15.png
diff --git a/distrib/textures/litspheres/sp00.png → textures/litspheres/sp00.png b/distrib/textures/litspheres/sp00.png → textures/litspheres/sp00.png
diff --git a/distrib/textures/litspheres/sp01.png → textures/litspheres/sp01.png b/distrib/textures/litspheres/sp01.png → textures/litspheres/sp01.png
diff --git a/distrib/textures/rgbarand.dds → textures/rgbarand.dds b/distrib/textures/rgbarand.dds → textures/rgbarand.dds
diff --git a/distrib/textures/rockbump.jpg → textures/rockbump.jpg b/distrib/textures/rockbump.jpg → textures/rockbump.jpg
diff --git a/distrib/textures/rockbump.tga → textures/rockbump.tga b/distrib/textures/rockbump.tga → textures/rockbump.tga
diff --git a/distrib/textures/uffiziCubeMap.dds → textures/uffiziCubeMap.dds b/distrib/textures/uffiziCubeMap.dds → textures/uffiziCubeMap.dds
diff --git a/distrib/textures/wood.jpg → textures/wood.jpg b/distrib/textures/wood.jpg → textures/wood.jpg