projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add newtonsCradle glb
[opengl.git]
/
material.cpp
diff --git
a/material.cpp
b/material.cpp
index 32bf9e0fef2d9b609265955a1c455cc64ef99fef..9ed7e9029401a859dc1428f39e091deecfeefa9b 100644
(file)
--- a/
material.cpp
+++ b/
material.cpp
@@
-35,7
+35,6
@@
Material::Texture::Texture(const aiString fileName, const aiScene &scene) {
glBindTexture(GL_TEXTURE_2D, texId);
std::string path;
glBindTexture(GL_TEXTURE_2D, texId);
std::string path;
- unsigned char *data;
if (fileName.data[0] == '*') {
// embedded
int embIdx = atoi(&fileName.data[1]);
if (fileName.data[0] == '*') {
// embedded
int embIdx = atoi(&fileName.data[1]);