griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Rename Eevee to EEVEE in labels/tooltips

Browse Source 
Remove ambiguity of Eevee/EEVEE in labels, tooltips, and docs.

The correct spelling is "EEVEE".

Pull Request: https://projects.blender.org/blender/blender/pulls/112501
This commit is contained in:
Pablo Vazquez
2023-09-18 12:28:36 +02:00
committed by Pablo Vazquez
parent 10c5c94eaf
commit a59ec4c936
8 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
release/freedesktop/org.blender.Blender.appdata.xml
View File

@@ -282,7 +282,7 @@
<p>Enhancements:</p>
<ul>
<li>Grease Pencil closer integration and improved performance</li>
<li>Eevee improved render passes, light cache and hair transparency</li>
<li>EEVEE improved render passes, light cache and hair transparency</li>
<li>Faster undo system</li>
<li>Rewritten multiresolution modifier</li>
<li>Improved hair physics collisions</li>
@@ -322,8 +322,8 @@
</ul>
<p>Enhancements:</p>
<ul>
<li>Eevee shadows, transparency and bump mapping redesigned</li>
<li>Viewport options for look development with Cycles and Eevee</li>
<li>EEVEE shadows, transparency and bump mapping redesigned</li>
<li>Viewport options for look development with Cycles and EEVEE</li>
<li>Finer control over rotations and scale in bones, constraints and drivers</li>
<li>Outliner improvements, new file browser and batch rename</li>
</ul>
@@ -335,7 +335,7 @@
<ul>
<li>Revamped user interface</li>
<li>Toolbar with tools and gizmos</li>
<li>Eevee - physically based realtime renderer</li>
<li>EEVEE - physically based realtime renderer</li>
<li>Modern 3D viewport</li>
<li>Full 2D animation and drawing system</li>
<li>New shaders for hair, sss, volumes, bevel and AO</li>

4
source/blender/draw/engines/eevee/eevee_engine.cc
View File

@@ -649,7 +649,7 @@ static const DrawEngineDataSize eevee_data_size = DRW_VIEWPORT_DATA_SIZE(EEVEE_D
DrawEngineType draw_engine_eevee_type = {
/*next*/ nullptr,
/*prev*/ nullptr,
/*idname*/ N_("Eevee"),
/*idname*/ N_("EEVEE"),
/*vedata_size*/ &eevee_data_size,
/*engine_init*/ &eevee_engine_init,
/*engine_free*/ &eevee_engine_free,
@@ -668,7 +668,7 @@ RenderEngineType DRW_engine_viewport_eevee_type = {
/*next*/ nullptr,
/*prev*/ nullptr,
/*idname*/ EEVEE_ENGINE,
/*name*/ N_("Eevee"),
/*name*/ N_("EEVEE"),
/*flag*/ RE_INTERNAL | RE_USE_PREVIEW | RE_USE_STEREO_VIEWPORT | RE_USE_GPU_CONTEXT,
/*update*/ nullptr,
/*render*/ &DRW_render_to_image,

4
source/blender/draw/engines/eevee_next/eevee_engine.cc
View File

@@ -198,7 +198,7 @@ extern "C" {
DrawEngineType draw_engine_eevee_next_type = {
/*next*/ nullptr,
/*prev*/ nullptr,
/*idname*/ N_("Eevee"),
/*idname*/ N_("EEVEE"),
/*vedata_size*/ &eevee_data_size,
/*engine_init*/ &eevee_engine_init,
/*engine_free*/ &eevee_engine_free,
@@ -217,7 +217,7 @@ RenderEngineType DRW_engine_viewport_eevee_next_type = {
/*next*/ nullptr,
/*prev*/ nullptr,
/*idname*/ "BLENDER_EEVEE_NEXT",
/*name*/ N_("Eevee Next"),
/*name*/ N_("EEVEE Next"),
/*flag*/ RE_INTERNAL | RE_USE_PREVIEW | RE_USE_STEREO_VIEWPORT | RE_USE_GPU_CONTEXT,
/*update*/ nullptr,
/*render*/ &DRW_render_to_image,

2
source/blender/makesrna/intern/rna_nodetree.cc
View File

@@ -552,7 +552,7 @@ static const EnumPropertyItem prop_shader_output_target_items[] = {
0,
"All",
"Use shaders for all renderers and viewports, unless there exists a more specific output"},
{SHD_OUTPUT_EEVEE, "EEVEE", 0, "Eevee", "Use shaders for Eevee renderer"},
{SHD_OUTPUT_EEVEE, "EEVEE", 0, "EEVEE", "Use shaders for EEVEE renderer"},
{SHD_OUTPUT_CYCLES, "CYCLES", 0, "Cycles", "Use shaders for Cycles renderer"},
{0, nullptr, 0, nullptr, nullptr},
};

7
source/blender/makesrna/intern/rna_render.cc
View File

@@ -943,8 +943,9 @@ static void rna_def_render_engine(BlenderRNA *brna)
prop = RNA_def_property(srna, "bl_use_eevee_viewport", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "type->flag", RE_USE_EEVEE_VIEWPORT);
RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL);
RNA_def_property_ui_text(
prop, "Use Eevee Viewport", "Uses Eevee for viewport shading in LookDev shading mode");
RNA_def_property_ui_text(prop,
"Use EEVEE Viewport",
"Uses EEVEE for viewport shading in Material Preview shading mode");
prop = RNA_def_property(srna, "bl_use_custom_freestyle", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "type->flag", RE_USE_CUSTOM_FREESTYLE);
@@ -978,7 +979,7 @@ static void rna_def_render_engine(BlenderRNA *brna)
RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL);
RNA_def_property_ui_text(prop,
"Use Custom Shading Nodes",
"Don't expose Cycles and Eevee shading nodes in the node editor user "
"Don't expose Cycles and EEVEE shading nodes in the node editor user "
"interface, so own nodes can be used instead");
prop = RNA_def_property(srna, "bl_use_spherical_stereo", PROP_BOOLEAN, PROP_NONE);

12
source/blender/makesrna/intern/rna_scene.cc
View File

@@ -4391,7 +4391,7 @@ static void rna_def_view_layer_eevee(BlenderRNA *brna)
PropertyRNA *prop;
srna = RNA_def_struct(brna, "ViewLayerEEVEE", nullptr);
RNA_def_struct_path_func(srna, "rna_ViewLayerEEVEE_path");
RNA_def_struct_ui_text(srna, "Eevee Settings", "View layer settings for Eevee");
RNA_def_struct_ui_text(srna, "EEVEE Settings", "View Layer settings for EEVEE");
prop = RNA_def_property(srna, "use_pass_volume_direct", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "render_passes", EEVEE_RENDER_PASS_VOLUME_LIGHT);
@@ -4550,7 +4550,7 @@ void rna_def_view_layer_common(BlenderRNA *brna, StructRNA *srna, const bool sce
prop = RNA_def_property(srna, "eevee", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_struct_type(prop, "ViewLayerEEVEE");
RNA_def_property_ui_text(prop, "Eevee Settings", "View layer settings for Eevee");
RNA_def_property_ui_text(prop, "EEVEE Settings", "View layer settings for EEVEE");
prop = RNA_def_property(srna, "aovs", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, nullptr, "aovs", nullptr);
@@ -6359,7 +6359,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
};
static const EnumPropertyItem engine_items[] = {
{0, "BLENDER_EEVEE", 0, "Eevee", ""},
{0, "BLENDER_EEVEE", 0, "EEVEE", ""},
{0, nullptr, 0, nullptr, nullptr},
};
@@ -8093,12 +8093,12 @@ static void rna_def_scene_eevee(BlenderRNA *brna)
prop = RNA_def_property(srna, "reflection_options", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "RaytraceEEVEE");
RNA_def_property_ui_text(
prop, "Reflection Trace Options", "Eevee settings for the tracing reflections");
prop, "Reflection Trace Options", "EEVEE settings for tracing reflections");
prop = RNA_def_property(srna, "refraction_options", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "RaytraceEEVEE");
RNA_def_property_ui_text(
prop, "Reflection Trace Options", "Eevee settings for the tracing reflections");
prop, "Refraction Trace Options", "EEVEE settings for tracing refractions");
}
static void rna_def_scene_gpencil(BlenderRNA *brna)
@@ -8637,7 +8637,7 @@ void RNA_def_scene(BlenderRNA *brna)
/* EEVEE */
prop = RNA_def_property(srna, "eevee", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "SceneEEVEE");
RNA_def_property_ui_text(prop, "Eevee", "Eevee settings for the scene");
RNA_def_property_ui_text(prop, "EEVEE", "EEVEE settings for the scene");
/* Grease Pencil */
prop = RNA_def_property(srna, "grease_pencil_settings", PROP_POINTER, PROP_NONE);

2
source/blender/nodes/NOD_static_types.h
View File

@@ -30,7 +30,7 @@ DefNode(ShaderNode, SH_NODE_VALUE, 0, "VALUE"
DefNode(ShaderNode, SH_NODE_MIX_RGB_LEGACY, def_mix_rgb, "MIX_RGB", MixRGB, "MixRGB", "Mix two input colors")
DefNode(ShaderNode, SH_NODE_VALTORGB, def_colorramp, "VALTORGB", ValToRGB, "Color Ramp", "Map values to colors with the use of a gradient")
DefNode(ShaderNode, SH_NODE_RGBTOBW, 0, "RGBTOBW", RGBToBW, "RGB to BW", "Convert a color's luminance to a grayscale value")
DefNode(ShaderNode, SH_NODE_SHADERTORGB, 0, "SHADERTORGB", ShaderToRGB, "Shader to RGB", "Convert rendering effect (such as light and shadow) to color. Typically used for non-photorealistic rendering, to apply additional effects on the output of BSDFs.\nNote: only supported for Eevee")
DefNode(ShaderNode, SH_NODE_SHADERTORGB, 0, "SHADERTORGB", ShaderToRGB, "Shader to RGB", "Convert rendering effect (such as light and shadow) to color. Typically used for non-photorealistic rendering, to apply additional effects on the output of BSDFs.\nNote: only supported in EEVEE")
DefNode(ShaderNode, SH_NODE_NORMAL, 0, "NORMAL", Normal, "Normal", "Generate a normal vector and a dot product")
DefNode(ShaderNode, SH_NODE_GAMMA, 0, "GAMMA", Gamma, "Gamma", "Apply a gamma correction")
DefNode(ShaderNode, SH_NODE_BRIGHTCONTRAST, 0, "BRIGHTCONTRAST", BrightContrast, "Brightness/Contrast","Control the brightness and contrast of the input color")

2
source/blender/nodes/shader/nodes/node_shader_tex_sky.cc
View File

@@ -44,7 +44,7 @@ static void node_shader_buts_tex_sky(uiLayout *layout, bContext *C, PointerRNA *
if (RNA_enum_get(ptr, "sky_type") == SHD_SKY_NISHITA) {
Scene *scene = CTX_data_scene(C);
if (BKE_scene_uses_blender_eevee(scene)) {
uiItemL(layout, TIP_("Sun disc not available in Eevee"), ICON_ERROR);
uiItemL(layout, TIP_("Sun disc not available in EEVEE"), ICON_ERROR);
}
uiItemR(layout, ptr, "sun_disc", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE);