diff options
| author | Clay John <claynjohn@gmail.com> | 2022-08-18 14:11:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-18 14:11:45 -0600 |
| commit | ca7437042ea96bdf31662896747167fb140914d9 (patch) | |
| tree | 3f0f5fd3cca9b778752888f28588c5ed44706a29 | |
| parent | 54eaf662b4e6a9d5715e08279a8816ba4ce36741 (diff) | |
| parent | a165d4dd72f1c34bac66bdb52587da823aeefac4 (diff) | |
Merge pull request #64470 from aaronfranke/shader-cd-st-enum
Move `ShaderCreateDialog`'s `ShaderType` enum out of the header
| -rw-r--r-- | editor/shader_create_dialog.cpp | 7 | ||||
| -rw-r--r-- | editor/shader_create_dialog.h | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/editor/shader_create_dialog.cpp b/editor/shader_create_dialog.cpp index bd1f2529ca..8c4a231e8a 100644 --- a/editor/shader_create_dialog.cpp +++ b/editor/shader_create_dialog.cpp @@ -37,6 +37,13 @@ #include "scene/resources/visual_shader.h" #include "servers/rendering/shader_types.h" +enum ShaderType { + SHADER_TYPE_TEXT, + SHADER_TYPE_VISUAL, + SHADER_TYPE_INC, + SHADER_TYPE_MAX, +}; + void ShaderCreateDialog::_notification(int p_what) { switch (p_what) { case NOTIFICATION_ENTER_TREE: { diff --git a/editor/shader_create_dialog.h b/editor/shader_create_dialog.h index bf031c3601..9ba655369b 100644 --- a/editor/shader_create_dialog.h +++ b/editor/shader_create_dialog.h @@ -44,13 +44,6 @@ class EditorFileDialog; class ShaderCreateDialog : public ConfirmationDialog { GDCLASS(ShaderCreateDialog, ConfirmationDialog); - enum ShaderType { - SHADER_TYPE_TEXT, - SHADER_TYPE_VISUAL, - SHADER_TYPE_INC, - SHADER_TYPE_MAX, - }; - struct ShaderTypeData { List<String> extensions; String default_extension; |