Merge pull request #1236 from Jehops/v2.5.20_build_error

Fix v2.5.20 build error (cannot convert std::nullptr_t to hyFloat)
veg · Oct 20, 2020 · f12276c · f12276c · kjlevitz · Oct 21, 2020
2 parents 9c4c27d + 5742860
commit f12276c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/core/matrix.cpp b/src/core/matrix.cpp
@@ -2236,7 +2236,7 @@ bool    _Matrix::IncreaseStorage    (void) {
         } else {
             theData = (hyFloat*) MemReallocate(theData, lDim*sizeof(void*));
             for (long i = lDim-allocationBlock; i < lDim; i++) {
-                theData [i] = ZEROPOINTER;
+                theData [i] = ZEROOBJECT;
             }
         }
     } else {