fix image_label() so it works with ImageMagick installed at a nonstandard location on CCSR
add a function to combine two lists of geometry
Make ogl3-assimp use color for untextured geometry
Reduce severity of a couple cmake warnings
Add additional debugging information if we fail to create the framebuffer
Attempt to correctly render only to depth buffer when asked
When reloading the shader programs, set the program in the fps quad's kuhl_geometry
Fix indentation
optimize code which updates geometry objects so it runs faster with large scenes that have no animation information
Merge branch 'master' of https://github.com/hhamilto/opengl-examples