← Back to branch summary

~unity-team/nux/nux-remove-glew-mx

« back to all changes in this revision

Viewing changes to Nux/StaticText.cpp

  • Committer: Jay Taoko
  • Date: 2011-05-30 02:54:31 UTC
  • mfrom: (353.1.1 nux)
  • Revision ID: jay.taoko@canonical.com-20110530025431-kpqcnbcq3apsfz92
* Object::Dispose() now does the same thing as Object::UnReference()
* Fixed memory leak in UXTheme::Load2DTextureFile
* Mesh Resource manager
    - Fixed mesh Resource manager pipeline
    - See example ProgObjMeshLoader

* Fixed GLSL Shaders in FontRendering.cpp
    - removed global variable USE_ARB_SHADERS and replaced with GraphicsEngine::UsingGLSLCodePath()

* Removing files IniFile.cpp/.h
* Removing files UIColorTheme.cpp/.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
Nux/StaticText.cpp
328
328
    if (_texture2D)
329
329
      _texture2D->UnReference ();
330
330
 
331
 
    _texture2D = GetGpuDevice()->CreateSystemCapableTexture ();
 
331
    _texture2D = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture ();
332
332
    _texture2D->Update (bitmap);
333
333
                
334
334
                delete bitmap;