Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source 
# Conflicts:
#	indra/llmath/lloctree.h
#	indra/newview/llsurface.cpp
This commit is contained in:
Liru Færs
2020-03-01 03:39:30 -05:00
parent e502b87b63 d2d172f6ec
commit b7086a993d
15 changed files with 393 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llmath/lloctree.h
View File

@@ -537,7 +537,7 @@ public:
OctreeStats::getInstance()->realloc(old_cap,mData.capacity());
#endif
this->notifyAddition(data);
LLOctreeNode<T>::notifyAddition(data);
return true;
}
else
@@ -593,7 +593,7 @@ public:
OctreeStats::getInstance()->realloc(old_cap,mData.capacity());
#endif
this->notifyAddition(data);
LLOctreeNode<T>::notifyAddition(data);
return true;
}