godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37896 from NutmegStudio/decal-enum-constant-fix 

Change DecalTexture bind from BIND_CONSTANT to BIND_ENUM_CONSTANT
This commit is contained in:
Rémi Verschelde 2020-04-15 12:02:19 +02:00 committed by GitHub
parent 5bc9616e8e fa6d9e0c01
commit 5b4ea6529a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/3d/decal.cpp
View File

@ -204,11 +204,11 @@ void Decal::_bind_methods() {
ADD_GROUP("Cull Mask", ""); ADD_GROUP("Cull Mask", "");
ADD_PROPERTY(PropertyInfo(Variant::INT, "cull_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_cull_mask", "get_cull_mask"); ADD_PROPERTY(PropertyInfo(Variant::INT, "cull_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_cull_mask", "get_cull_mask");
BIND_CONSTANT(TEXTURE_ALBEDO); BIND_ENUM_CONSTANT(TEXTURE_ALBEDO);
BIND_CONSTANT(TEXTURE_NORMAL); BIND_ENUM_CONSTANT(TEXTURE_NORMAL);
BIND_CONSTANT(TEXTURE_ORM); BIND_ENUM_CONSTANT(TEXTURE_ORM);
BIND_CONSTANT(TEXTURE_EMISSION); BIND_ENUM_CONSTANT(TEXTURE_EMISSION);
BIND_CONSTANT(TEXTURE_MAX); BIND_ENUM_CONSTANT(TEXTURE_MAX);
} }
Decal::Decal() { Decal::Decal() {