3462ddf17f38eb61fc3bb2751d55de15a47455c3
Cut out some unwanted differences with trunk in preparation for merge. Also fixed some warnings, though many remain.
Description
No description provided
Languages
C++
78%
Python
14.9%
C
2.9%
GLSL
1.9%
CMake
1.2%
Other
0.9%