minor changes and added namespace to avoid conflicts when integrating with PanoPainter

This commit is contained in:
2017-03-15 08:17:22 +00:00
parent ee6d352fc6
commit c34d1a1f44
16 changed files with 112 additions and 39 deletions

View File

@@ -1,6 +1,8 @@
#include "pch.h"
#include "shader.h"
using namespace ui;
std::map<kShader, Shader> ShaderManager::m_shaders;
Shader* ShaderManager::m_current;