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

Cleanup: Overlay: Rename edit_text.hh to text.hh for consistency

Browse Source
This commit is contained in:
Clément Foucault
2025-05-08 13:38:37 +02:00
parent 9c8a7b8d11
commit 388fcdb934
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/CMakeLists.txt
View File

@@ -248,7 +248,7 @@ set(SRC
engines/overlay/overlay_camera.hh
engines/overlay/overlay_cursor.hh
engines/overlay/overlay_curve.hh
engines/overlay/overlay_edit_text.hh
engines/overlay/overlay_text.hh
engines/overlay/overlay_empty.hh
engines/overlay/overlay_engine.h
engines/overlay/overlay_facing.hh

8
source/blender/draw/engines/overlay/overlay_instance.cc
View File

@@ -447,7 +447,7 @@ void Instance::begin_sync()
layer.bounds.begin_sync(resources, state);
layer.cameras.begin_sync(resources, state);
layer.curves.begin_sync(resources, state);
layer.edit_text.begin_sync(resources, state);
layer.text.begin_sync(resources, state);
layer.empties.begin_sync(resources, state);
layer.facing.begin_sync(resources, state);
layer.fade.begin_sync(resources, state);
@@ -573,7 +573,7 @@ void Instance::object_sync(ObjectRef &ob_ref, Manager &manager)
layer.pointclouds.edit_object_sync(manager, ob_ref, resources, state);
break;
case OB_FONT:
layer.edit_text.edit_object_sync(manager, ob_ref, resources, state);
layer.text.edit_object_sync(manager, ob_ref, resources, state);
break;
case OB_GREASE_PENCIL:
layer.grease_pencil.edit_object_sync(manager, ob_ref, resources, state);
@@ -653,7 +653,7 @@ void Instance::end_sync()
layer.axes.end_sync(resources, state);
layer.bounds.end_sync(resources, state);
layer.cameras.end_sync(resources, state);
layer.edit_text.end_sync(resources, state);
layer.text.end_sync(resources, state);
layer.empties.end_sync(resources, state);
layer.force_fields.end_sync(resources, state);
layer.lights.end_sync(resources, state);
@@ -812,7 +812,7 @@ void Instance::draw_v3d(Manager &manager, View &view)
// layer.facing.draw(framebuffer, manager, view);
layer.fade.draw(framebuffer, manager, view);
layer.mode_transfer.draw(framebuffer, manager, view);
layer.edit_text.draw(framebuffer, manager, view);
layer.text.draw(framebuffer, manager, view);
layer.paints.draw(framebuffer, manager, view);
layer.particles.draw(framebuffer, manager, view);
};

4
source/blender/draw/engines/overlay/overlay_instance.hh
View File

@@ -20,7 +20,6 @@
#include "overlay_camera.hh"
#include "overlay_cursor.hh"
#include "overlay_curve.hh"
#include "overlay_edit_text.hh"
#include "overlay_empty.hh"
#include "overlay_facing.hh"
#include "overlay_fade.hh"
@@ -45,6 +44,7 @@
#include "overlay_relation.hh"
#include "overlay_sculpt.hh"
#include "overlay_speaker.hh"
#include "overlay_text.hh"
#include "overlay_wireframe.hh"
#include "overlay_xray_fade.hh"
@@ -82,7 +82,7 @@ class Instance : public DrawEngine {
Bounds bounds = {selection_type_};
Cameras cameras = {selection_type_};
Curves curves;
EditText edit_text = {selection_type_};
Text text = {selection_type_};
Empties empties = {selection_type_};
Facing facing;
Fade fade;

4
source/blender/draw/engines/overlay/overlay_edit_text.hh → source/blender/draw/engines/overlay/overlay_text.hh
View File

@@ -19,7 +19,7 @@ namespace blender::draw::overlay {
* Text objects related overlays.
* Currently only display cursor and selection of text edit mode.
*/
class EditText : Overlay {
class Text : Overlay {
private:
PassSimple ps_ = {"TextEdit"};
@@ -37,7 +37,7 @@ class EditText : Overlay {
gpu::Batch *quad_wire = nullptr;
public:
EditText(SelectionType selection_type) : box_line_buf_(selection_type, "box_line_buf_") {}
Text(SelectionType selection_type) : box_line_buf_(selection_type, "box_line_buf_") {}
void begin_sync(Resources &res, const State &state) final
{