From da4343b0b5f659f8ed55f9c92c8d214a84f9b3ba Mon Sep 17 00:00:00 2001 From: Paul Demeulenaere Date: Tue, 18 Oct 2016 15:42:17 +0200 Subject: [PATCH 1/4] Add External MaterialGraph --- .gitmodules | 4 ++++ External | 1 + 2 files changed, 5 insertions(+) create mode 100644 .gitmodules create mode 160000 External diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..d2fb42fcb98 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "External"] + path = External + url = https://github.com/stramit/MaterialGraph.git/ + branch = NewUI diff --git a/External b/External new file mode 160000 index 00000000000..005ae72a7cd --- /dev/null +++ b/External @@ -0,0 +1 @@ +Subproject commit 005ae72a7cd26bde6859307aa381950060db9aa8 From cb08abde678b1f1cd25b9f870c43290e63656861 Mon Sep 17 00:00:00 2001 From: Paul Demeulenaere Date: Tue, 18 Oct 2016 16:13:56 +0200 Subject: [PATCH 2/4] Add SymLink helper and ignore duplicated files from this repository (maybe is there a better way ?) --- .gitignore | 3 +++ _ExternalSymLink.sh | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 _ExternalSymLink.sh diff --git a/.gitignore b/.gitignore index f2276c79ae6..fa53e3e9a12 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ DataSource/* Assets/UnityHDRI.meta Assets/UnityHDRI/Gareoult/GareoultWhiteBalanced.exr +Assets/GraphFramework/* +Assets/NewUI/* +Assets/UnityShaderEditor/* \ No newline at end of file diff --git a/_ExternalSymLink.sh b/_ExternalSymLink.sh new file mode 100644 index 00000000000..56290eaecb9 --- /dev/null +++ b/_ExternalSymLink.sh @@ -0,0 +1,4 @@ +cd Assets +ln -s ../External/MaterialGraphProject/Assets/GraphFramework GraphFramework +ln -s ../External/MaterialGraphProject/Assets/NewUI NewUI +ln -s ../External/MaterialGraphProject/Assets/UnityShaderEditor UnityShaderEditor From 72196d7e3869c18dde28c6b2a5d77dc103afedd4 Mon Sep 17 00:00:00 2001 From: Paul Demeulenaere Date: Wed, 19 Oct 2016 15:57:40 +0200 Subject: [PATCH 3/4] Update MaterialGraph submodule and fix symlink --- External | 2 +- _ExternalSymLink.bat | 4 ++++ _ExternalSymLink.sh | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 _ExternalSymLink.bat delete mode 100644 _ExternalSymLink.sh diff --git a/External b/External index 005ae72a7cd..b58bec634d3 160000 --- a/External +++ b/External @@ -1 +1 @@ -Subproject commit 005ae72a7cd26bde6859307aa381950060db9aa8 +Subproject commit b58bec634d3f83a974934931d8f6ee513724288c diff --git a/_ExternalSymLink.bat b/_ExternalSymLink.bat new file mode 100644 index 00000000000..9324977d4cb --- /dev/null +++ b/_ExternalSymLink.bat @@ -0,0 +1,4 @@ +mklink /J "Assets\UnityShaderEditor" "%cd%\External\MaterialGraphProject\Assets\UnityShaderEditor" +mklink /J "Assets\NewUI" "%cd%\External\MaterialGraphProject\Assets\NewUI" +mklink /J "Assets\GraphFramework" "%cd%\External\MaterialGraphProject\Assets\GraphFramework" +pause \ No newline at end of file diff --git a/_ExternalSymLink.sh b/_ExternalSymLink.sh deleted file mode 100644 index 56290eaecb9..00000000000 --- a/_ExternalSymLink.sh +++ /dev/null @@ -1,4 +0,0 @@ -cd Assets -ln -s ../External/MaterialGraphProject/Assets/GraphFramework GraphFramework -ln -s ../External/MaterialGraphProject/Assets/NewUI NewUI -ln -s ../External/MaterialGraphProject/Assets/UnityShaderEditor UnityShaderEditor From eff3c7107e4308bc9b5655a896ad8ac0007e20a8 Mon Sep 17 00:00:00 2001 From: Paul Demeulenaere Date: Wed, 19 Oct 2016 16:05:42 +0200 Subject: [PATCH 4/4] Fix windows symlink batch (temporary tool) --- _ExternalSymLink.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_ExternalSymLink.bat b/_ExternalSymLink.bat index 9324977d4cb..271e0e9892d 100644 --- a/_ExternalSymLink.bat +++ b/_ExternalSymLink.bat @@ -1,4 +1,4 @@ -mklink /J "Assets\UnityShaderEditor" "%cd%\External\MaterialGraphProject\Assets\UnityShaderEditor" -mklink /J "Assets\NewUI" "%cd%\External\MaterialGraphProject\Assets\NewUI" -mklink /J "Assets\GraphFramework" "%cd%\External\MaterialGraphProject\Assets\GraphFramework" +mklink /J "%cd%\Assets\UnityShaderEditor" "%cd%\External\MaterialGraphProject\Assets\UnityShaderEditor" +mklink /J "%cd%\Assets\NewUI" "%cd%\External\MaterialGraphProject\Assets\NewUI" +mklink /J "%cd%\Assets\GraphFramework" "%cd%\External\MaterialGraphProject\Assets\GraphFramework" pause \ No newline at end of file