aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJuan Linietsky2017-01-10 22:20:57 -0300
committerJuan Linietsky2017-01-10 22:20:57 -0300
commit4338c9016347159d9562a5435e4c81afc21a362a (patch)
tree639c27da13718bcdfff64e5f95be4efffa45b576 /core
parent80b733a33a56067eb7a067f0f1ce30b6c38275f8 (diff)
downloadgodot-4338c9016347159d9562a5435e4c81afc21a362a.tar.gz
godot-4338c9016347159d9562a5435e4c81afc21a362a.tar.zst
godot-4338c9016347159d9562a5435e4c81afc21a362a.zip
Diffstat (limited to 'core')
-rw-r--r--core/global_constants.cpp7
-rw-r--r--core/object.h5
2 files changed, 10 insertions, 2 deletions
diff --git a/core/global_constants.cpp b/core/global_constants.cpp
index 320f64940..88d986f60 100644
--- a/core/global_constants.cpp
+++ b/core/global_constants.cpp
@@ -463,7 +463,12 @@ static _GlobalConstant _global_constants[]={
BIND_GLOBAL_CONSTANT( PROPERTY_HINT_LENGTH ),
BIND_GLOBAL_CONSTANT( PROPERTY_HINT_KEY_ACCEL ),
BIND_GLOBAL_CONSTANT( PROPERTY_HINT_FLAGS ),
- BIND_GLOBAL_CONSTANT( PROPERTY_HINT_ALL_FLAGS ),
+
+ BIND_GLOBAL_CONSTANT( PROPERTY_HINT_LAYERS_2D_RENDER ),
+ BIND_GLOBAL_CONSTANT( PROPERTY_HINT_LAYERS_2D_PHYSICS ),
+ BIND_GLOBAL_CONSTANT( PROPERTY_HINT_LAYERS_3D_RENDER ),
+ BIND_GLOBAL_CONSTANT( PROPERTY_HINT_LAYERS_3D_PHYSICS),
+
BIND_GLOBAL_CONSTANT( PROPERTY_HINT_FILE ),
BIND_GLOBAL_CONSTANT( PROPERTY_HINT_DIR ),
BIND_GLOBAL_CONSTANT( PROPERTY_HINT_GLOBAL_FILE ),
diff --git a/core/object.h b/core/object.h
index b67548608..a54693eab 100644
--- a/core/object.h
+++ b/core/object.h
@@ -58,7 +58,10 @@ enum PropertyHint {
PROPERTY_HINT_SPRITE_FRAME,
PROPERTY_HINT_KEY_ACCEL, ///< hint_text= "length" (as integer)
PROPERTY_HINT_FLAGS, ///< hint_text= "flag1,flag2,etc" (as bit flags)
- PROPERTY_HINT_ALL_FLAGS,
+ PROPERTY_HINT_LAYERS_2D_RENDER,
+ PROPERTY_HINT_LAYERS_2D_PHYSICS,
+ PROPERTY_HINT_LAYERS_3D_RENDER,
+ PROPERTY_HINT_LAYERS_3D_PHYSICS,
PROPERTY_HINT_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
PROPERTY_HINT_DIR, ///< a directort path must be passed
PROPERTY_HINT_GLOBAL_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"