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

Merge pull request #44868 from Muller-Castro/typo-correction

Browse Source 
Typo correction
This commit is contained in:
Rémi Verschelde 2021-01-02 11:00:37 +01:00 committed by GitHub
commit f29795c0e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/import/resource_importer_texture.h
View File

@ -62,7 +62,7 @@ protected:
struct MakeInfo { struct MakeInfo {
int flags = 0; int flags = 0;
String normal_path_for_roughness; String normal_path_for_roughness;
RS::TextureDetectRoughnessChannel channel_for_roughness = RS::TEXTURE_DETECT_ROUGNHESS_R; RS::TextureDetectRoughnessChannel channel_for_roughness = RS::TEXTURE_DETECT_ROUGHNESS_R;
}; };
Map<StringName, MakeInfo> make_flags; Map<StringName, MakeInfo> make_flags;

2
servers/rendering/renderer_rd/renderer_storage_rd.cpp
View File

@ -2216,7 +2216,7 @@ void RendererStorageRD::MaterialData::update_textures(const Map<StringName, Vari
RendererStorageRD *singleton = (RendererStorageRD *)RendererStorage::base_singleton; RendererStorageRD *singleton = (RendererStorageRD *)RendererStorage::base_singleton;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
Texture *roughness_detect_texture = nullptr; Texture *roughness_detect_texture = nullptr;
RS::TextureDetectRoughnessChannel roughness_channel = RS::TEXTURE_DETECT_ROUGNHESS_R; RS::TextureDetectRoughnessChannel roughness_channel = RS::TEXTURE_DETECT_ROUGHNESS_R;
Texture *normal_detect_texture = nullptr; Texture *normal_detect_texture = nullptr;
#endif #endif

10
servers/rendering_server.h
View File

@ -130,11 +130,11 @@ public:
virtual void texture_set_detect_normal_callback(RID p_texture, TextureDetectCallback p_callback, void *p_userdata) = 0; virtual void texture_set_detect_normal_callback(RID p_texture, TextureDetectCallback p_callback, void *p_userdata) = 0;
enum TextureDetectRoughnessChannel { enum TextureDetectRoughnessChannel {
TEXTURE_DETECT_ROUGNHESS_R, TEXTURE_DETECT_ROUGHNESS_R,
TEXTURE_DETECT_ROUGNHESS_G, TEXTURE_DETECT_ROUGHNESS_G,
TEXTURE_DETECT_ROUGNHESS_B, TEXTURE_DETECT_ROUGHNESS_B,
TEXTURE_DETECT_ROUGNHESS_A, TEXTURE_DETECT_ROUGHNESS_A,
TEXTURE_DETECT_ROUGNHESS_GRAY, TEXTURE_DETECT_ROUGHNESS_GRAY,
}; };
typedef void (*TextureDetectRoughnessCallback)(void *, const String &, TextureDetectRoughnessChannel); typedef void (*TextureDetectRoughnessCallback)(void *, const String &, TextureDetectRoughnessChannel);