diff options
author | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-06-12 20:41:49 +0000 |
---|---|---|
committer | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-06-12 20:41:49 +0000 |
commit | 20b3d56987ca7b7a9d7f27b0a32a93f12e8dc530 (patch) | |
tree | 5fd7cc45a44c46b1134788ed90ffb70398179f4d /examples/22.MaterialViewer/main.cpp | |
parent | 084e0e669a8d9c6a373ff3bcb410febca4d4a48a (diff) | |
download | irrlicht-20b3d56987ca7b7a9d7f27b0a32a93f12e8dc530.tar.xz |
Merging r6075 through r6106 from trunk to ogl-es branch.
Burnings renderer changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116 dfc29bdd-3216-0410-991c-e03cc46cb475
Diffstat (limited to 'examples/22.MaterialViewer/main.cpp')
-rwxr-xr-x | examples/22.MaterialViewer/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/22.MaterialViewer/main.cpp b/examples/22.MaterialViewer/main.cpp index 8330926..358ce02 100755 --- a/examples/22.MaterialViewer/main.cpp +++ b/examples/22.MaterialViewer/main.cpp @@ -429,7 +429,7 @@ void CMaterialControl::init(scene::IMeshSceneNode* node, IrrlichtDevice * device Driver = device->getVideoDriver ();
gui::IGUIEnvironment* guiEnv = device->getGUIEnvironment();
- scene::ISceneManager* smgr = device->getSceneManager();
+ //scene::ISceneManager* smgr = device->getSceneManager();
const video::SMaterial & material = node->getMaterial(0);
s32 top = pos.Y;
|