diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-20 17:35:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 17:35:32 +0100 |
| commit | 7e3b92f81feb0597c657d13797e0ebf449ec2d5d (patch) | |
| tree | 1ac984c6b5ef5b407518f9690cbdd8044d99f5f1 /servers | |
| parent | dbd560cb688fed317bfea4d2d630d93e47ac9780 (diff) | |
| parent | e962900f2344b4ca797002ddf440625087f63291 (diff) | |
Merge pull request #55360 from Calinou/rename-bake-mode-properties
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/rendering/renderer_rd/shaders/light_data_inc.glsl | 4 | ||||
| -rw-r--r-- | servers/rendering_server.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering_server.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/servers/rendering/renderer_rd/shaders/light_data_inc.glsl b/servers/rendering/renderer_rd/shaders/light_data_inc.glsl index fdc7729338..52787bb204 100644 --- a/servers/rendering/renderer_rd/shaders/light_data_inc.glsl +++ b/servers/rendering/renderer_rd/shaders/light_data_inc.glsl @@ -1,6 +1,6 @@ #define LIGHT_BAKE_DISABLED 0 -#define LIGHT_BAKE_DYNAMIC 1 -#define LIGHT_BAKE_STATIC 2 +#define LIGHT_BAKE_STATIC 1 +#define LIGHT_BAKE_DYNAMIC 2 struct LightData { //this structure needs to be as packed as possible highp vec3 position; diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index 863aae6e4c..21cc1017ae 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -1927,8 +1927,8 @@ void RenderingServer::_bind_methods() { BIND_ENUM_CONSTANT(LIGHT_PARAM_MAX); BIND_ENUM_CONSTANT(LIGHT_BAKE_DISABLED); - BIND_ENUM_CONSTANT(LIGHT_BAKE_DYNAMIC); BIND_ENUM_CONSTANT(LIGHT_BAKE_STATIC); + BIND_ENUM_CONSTANT(LIGHT_BAKE_DYNAMIC); BIND_ENUM_CONSTANT(LIGHT_OMNI_SHADOW_DUAL_PARABOLOID); BIND_ENUM_CONSTANT(LIGHT_OMNI_SHADOW_CUBE); diff --git a/servers/rendering_server.h b/servers/rendering_server.h index 945fd052c6..b067db3d27 100644 --- a/servers/rendering_server.h +++ b/servers/rendering_server.h @@ -447,8 +447,8 @@ public: enum LightBakeMode { LIGHT_BAKE_DISABLED, - LIGHT_BAKE_DYNAMIC, LIGHT_BAKE_STATIC, + LIGHT_BAKE_DYNAMIC, }; virtual void light_set_bake_mode(RID p_light, LightBakeMode p_bake_mode) = 0; |