summarylogtreecommitdiffstats
path: root/nullptr.patch
diff options
context:
space:
mode:
authorJonathan Liu2016-12-26 14:22:49 +1100
committerJonathan Liu2016-12-26 16:19:47 +1100
commit58293469f6dffd36413386a8d1ab83c6b92d4559 (patch)
tree1b46cdc7fd5a2b9544a22c11113e89935616314a /nullptr.patch
parent51cdfcc80b4bc98a8d662a2e8ae792a7999d8573 (diff)
downloadaur-58293469f6dffd36413386a8d1ab83c6b92d4559.tar.gz
Update to 2016.12-1
Diffstat (limited to 'nullptr.patch')
-rw-r--r--nullptr.patch24
1 files changed, 0 insertions, 24 deletions
diff --git a/nullptr.patch b/nullptr.patch
deleted file mode 100644
index f212f30fc00d..000000000000
--- a/nullptr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
---- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2013-05-23 01:09:58.000000000 +1000
-+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2016-05-23 12:55:48.495725226 +1000
-@@ -122,7 +122,7 @@
- currentT = p;
-
- // We do not intersect grid.
-- if (!found) return false;
-+ if (!found) return 0;
- }
-
- stepX = (dir.x() > 0) ? 1 : -1;
-diff -Nur meshlab.orig/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp meshlab/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
---- meshlab.orig/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2014-02-07 20:38:23.000000000 +1100
-+++ meshlab/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2016-05-23 12:55:58.752439956 +1000
-@@ -122,7 +122,7 @@
- currentT = p;
-
- // We do not intersect grid.
-- if (!found) return false;
-+ if (!found) return 0;
- }
-
- stepX = (dir.x() > 0) ? 1 : -1;