summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2014-10-15 04:13:53 +0200
committerRealBadAngel <maciej.kasatkin@o2.pl>2014-10-18 16:42:23 +0200
commit0066bd77d25793b76fdaa9a62755cca934f0121d (patch)
tree61760994616113cd307d6dc6c2980f5f547fa78f /src/script
parentd1ccc64e1ecfd00df36d2b8a8b3420b70434fefd (diff)
downloadminetest-0066bd77d25793b76fdaa9a62755cca934f0121d.tar.gz
minetest-0066bd77d25793b76fdaa9a62755cca934f0121d.tar.bz2
minetest-0066bd77d25793b76fdaa9a62755cca934f0121d.zip
Add meshnode drawtype.
Diffstat (limited to 'src/script')
-rw-r--r--src/script/common/c_content.cpp3
-rw-r--r--src/script/cpp_api/s_node.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 2f749043e..4737f1993 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -281,6 +281,9 @@ ContentFeatures read_content_features(lua_State *L, int index)
ScriptApiNode::es_DrawType,NDT_NORMAL);
getfloatfield(L, index, "visual_scale", f.visual_scale);
+ /* Meshnode model filename */
+ getstringfield(L, index, "mesh", f.mesh);
+
// tiles = {}
lua_getfield(L, index, "tiles");
// If nil, try the deprecated name "tile_images" instead
diff --git a/src/script/cpp_api/s_node.cpp b/src/script/cpp_api/s_node.cpp
index 05f908004..e3d3fb58b 100644
--- a/src/script/cpp_api/s_node.cpp
+++ b/src/script/cpp_api/s_node.cpp
@@ -45,6 +45,7 @@ struct EnumString ScriptApiNode::es_DrawType[] =
{NDT_FENCELIKE, "fencelike"},
{NDT_RAILLIKE, "raillike"},
{NDT_NODEBOX, "nodebox"},
+ {NDT_MESH, "mesh"},
{0, NULL},
};