fixes to previous merge for working compile

modules/gfx/pymod/export_gfx_obj.cc

modules/gfx/pymod/export_render_options.cc

modules/gfx/src/bitmap_io.cc

modules/gfx/src/entity.cc

modules/gfx/src/gfx_object.cc

modules/gfx/src/gfx_test_object.cc

modules/gfx/src/gl_helper.hh

modules/gfx/src/impl/cartoon_renderer.cc

modules/gfx/src/impl/entity_detail.cc

modules/gfx/src/impl/glx_offscreen_buffer.cc

modules/gfx/src/impl/scene_fx.cc

modules/gfx/src/map_iso.cc

modules/gfx/src/map_slab.hh

modules/gfx/src/scene.cc

modules/gfx/src/shader.cc

modules/gfx/src/vertex_array.cc

modules/gui/src/gl_win.cc

modules/gui/src/tools/map_tool.cc

modules/mol/base/src/query_view_wrapper.cc