This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Assets/MarkLight/Source/Plugins/ExtensionMethods.cs b/Assets/MarkLight/Source/Plugins/ExtensionMethods.cs | |
| index ff2dc09..eac89f7 100644 | |
| --- a/Assets/MarkLight/Source/Plugins/ExtensionMethods.cs | |
| +++ b/Assets/MarkLight/Source/Plugins/ExtensionMethods.cs | |
| @@ -29,7 +29,7 @@ namespace MarkLight | |
| { | |
| bool skipChild = false; | |
| var childView = child.GetComponent<View>(); | |
| - if (parent != null) | |
| + if (parent != null && childView != null) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #cloud-config | |
| hostname: docker1 | |
| coreos: | |
| etcd: | |
| addr: $private_ipv4:4001 | |
| peer-addr: $private_ipv4:7001 | |
| units: | |
| - name: etcd.service |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| module () { eval `/usr/local/modules/3.2.10-1/Modules/3.2.10/bin/modulecmd sh $*`; } | |
| set +x | |
| export MODULEPATH="/global/apps/modulefiles:$MODULEPATH" | |
| module load cmake/3.1.3-1 | |
| module load gcc/4.8.1-3 | |
| module load boost/1.55.0-4 | |
| module load doxygen/1.8.7-1_gcc_4.8.1 | |
| set -x |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| pdi = self.GetPolyDataInput() | |
| pdo = self.GetPolyDataOutput() | |
| numpts = pdi.GetNumberOfPoints() | |
| pdata = pdi.GetPointData() | |
| tcoords = pdata.GetTCoords() | |
| newtcoords = vtk.vtkFloatArray() | |
| newtcoords.SetName("textureCoords") | |
| newtcoords.SetNumberOfComponents(2) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <?xml version='1.0' encoding='ISO-8859-15'?> | |
| <!-- Unity3D Asset Camera Path Animator XML Exporter http://camerapathanimator.jasperstocker.com --> | |
| <camerapath> | |
| <positionx>0</positionx> | |
| <positiony>0</positiony> | |
| <positionz>0</positionz> | |
| <interpolation>Bezier</interpolation> | |
| <linkedPath>null</linkedPath> | |
| <looped>False</looped> | |
| <animator> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Assets/MarkUX/Source/Views/Slider.cs b/Assets/MarkUX/Source/Views/Slider.cs | |
| index c672482..3d8d4dd 100644 | |
| --- a/Assets/MarkUX/Source/Views/Slider.cs | |
| +++ b/Assets/MarkUX/Source/Views/Slider.cs | |
| @@ -1,4 +1,4 @@ | |
| -#region Using Statements | |
| +#region Using Statements | |
| using System; | |
| using System.Collections.Generic; | |
| using System.Linq; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Initialize engine version: 4.6.7p2 (7b25b1e9dbbf) | |
| Forcing GfxDevice: 1 | |
| GfxDevice: creating device client; threaded=1 | |
| Direct3D: | |
| Version: Direct3D 9.0c [nvd3dum.dll 9.18.13.4105] | |
| Renderer: NVIDIA Quadro 5000 | |
| Vendor: NVIDIA | |
| VRAM: 2508 MB (via DXGI) | |
| Caps: Shader=30 DepthRT=1 NativeDepth=1 NativeShadow=1 DF16=0 INTZ=1 RAWZ=0 NULL=1 RESZ=0 SlowINTZ=0 | |
| Begin MonoManager ReloadAssembly |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <?xml version="1.0" encoding="utf-8"?> | |
| <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian"> | |
| <UnstructuredGrid> | |
| <Piece NumberOfPoints="12" NumberOfCells="2"> | |
| <PointData> | |
| <DataArray type="Int32" Name="PointIDs" format="ascii"> | |
| 0 1 2 3 4 5 6 7 8 9 10 11 | |
| </DataArray> | |
| </PointData> | |
| <CellData Scalars="MaterialIDs"> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #cloud-config | |
| hostname: visnode14 | |
| coreos: | |
| etcd: | |
| addr: $private_ipv4:4001 | |
| peer-addr: $private_ipv4:7001 | |
| units: | |
| - name: etcd.service |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters