mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: gizmos: fix the compiling issue 

caused by cherry-pick of aef92cd8eb9bae95939fdc1e8dfadec4ca529a3e

Change-Id: I8fdfd2df0bbb2a8a31e164cc7bbb29c66f07d03e
This commit is contained in:
lane.wei 2024-07-06 16:44:27 +08:00 committed by Lane.Wei
parent 5bc97e4997
commit 0756fd979a
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Gizmos/GLGizmoText.hpp
View File

@ -114,11 +114,7 @@ protected:
void show_tooltip_information(float x, float y);
private:
<<<<<<< HEAD (ac285d FIX:return bar pos only been modified in 3d view)
ModelVolume *get_selected_single_volume(int& out_object_idx, int& out_volume_idx) const;
void update_font_status();
=======
>>>>>>> CHANGE (aef92c FIX:move text should update text info)
void reset_text_info();
bool update_text_positions(const std::vector<std::string>& texts);
TriangleMesh get_text_mesh(const char* text_str, const Vec3d &position, const Vec3d &normal, const Vec3d &text_up_dir);
@ -135,4 +131,4 @@ private:
} // namespace GUI
} // namespace Slic3r
#endif // slic3r_GLGizmoText_hpp_
#endif // slic3r_GLGizmoText_hpp_