diff options
| author | MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com> | 2012-10-24 00:11:24 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-11-25 18:14:15 +0200 |
| commit | f9675bd2b4d48b9517cd4939a5cfe1ea9c775b6c (patch) | |
| tree | f5f61bb83f24383251660ee817d5e014d9bd87aa /src/scriptapi.cpp | |
| parent | cb40b3517a2dfac96c6733ce6e89e13822998cf9 (diff) | |
| download | minetest-f9675bd2b4d48b9517cd4939a5cfe1ea9c775b6c.tar.gz minetest-f9675bd2b4d48b9517cd4939a5cfe1ea9c775b6c.tar.bz2 minetest-f9675bd2b4d48b9517cd4939a5cfe1ea9c775b6c.zip | |
Add a subfolder for models and transfer models from server to client
(obj, md2 and md3 are currently allowed)
Get rid of the texture string and use the existing textures array. Segmented meshes have multiple materials, and this will allow us to texture each. Do not switch to this commit yet!
If a texture string is left empty in LUA, don't modify that material. Useful so a script can change specific textures without affecting others
Diffstat (limited to 'src/scriptapi.cpp')
| -rw-r--r-- | src/scriptapi.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index 7eda636e3..9293e2b65 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -938,7 +938,6 @@ static void read_object_properties(lua_State *L, int index, getstringfield(L, -1, "visual", prop->visual); getstringfield(L, -1, "mesh", prop->mesh); - getstringfield(L, -1, "texture", prop->texture); lua_getfield(L, -1, "visual_size"); if(lua_istable(L, -1)) @@ -6591,6 +6590,8 @@ void scriptapi_luaentity_get_properties(lua_State *L, u16 id, lua_pop(L, 1); getstringfield(L, -1, "visual", prop->visual); + + getstringfield(L, -1, "mesh", prop->mesh); // Deprecated: read object properties directly read_object_properties(L, -1, prop); |