proller
/
freeminer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

master
proller 2016-05-29 02:17:19 +03:00
parent 78d54d7d6c
commit fc5877ffa2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nodedef.h
View File

@ -454,7 +454,7 @@ struct ContentFeatures
}
#ifndef SERVER
//#ifndef SERVER
void fillTileAttribs(ITextureSource *tsrc, TileSpec *tile, TileDef *tiledef,
u32 shader_id, bool use_normal_texture, bool backface_culling,
u8 alpha, u8 material_type);
@ -462,7 +462,7 @@ struct ContentFeatures
scene::ISceneManager *smgr, scene::IMeshManipulator *meshmanip,
IGameDef *gamedef, const TextureSettings &tsettings,
bool server = false);
#endif
//#endif
};
class INodeDefManager {