projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7cb5217
)
Revert "Fix multiple texture support for animated meshnodes." (broke existing models)
author
PilzAdam
<pilzadam@minetest.net>
Thu, 6 Jun 2013 17:13:41 +0000
(17:13 +0000)
committer
PilzAdam
<pilzadam@minetest.net>
Thu, 6 Jun 2013 17:13:41 +0000
(17:13 +0000)
This reverts commit
649dca4d16786ed4e5b74878f56b86dea4f02542
.
src/content_cao.cpp
patch
|
blob
|
history
diff --git
a/src/content_cao.cpp
b/src/content_cao.cpp
index 57bbb30b960f8152b19af4831b15680283f72ead..f79d0d6f62c78d63467b4b75180d6687aae33809 100644
(file)
--- a/
src/content_cao.cpp
+++ b/
src/content_cao.cpp
@@
-1308,7
+1308,7
@@
public:
}
// Set material flags and texture
- m_animated_meshnode->
getMaterial(i).TextureLayer[0].Texture = texture
;
+ m_animated_meshnode->
setMaterialTexture(i, texture)
;
video::SMaterial& material = m_animated_meshnode->getMaterial(i);
material.setFlag(video::EMF_LIGHTING, false);
material.setFlag(video::EMF_BILINEAR_FILTER, false);