3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 02:07:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New selection -> removed obsolete parameters from GLVolumeCollection::load_object()

Browse source
This commit is contained in:
Enrico Turri 2018-10-08 16:05:55 +02:00
parent 9ae6d115a2
commit 99fe5761d8
4 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/3DScene.hpp
View file

@ -437,6 +437,14 @@ public:
GLVolumeCollection() {};
~GLVolumeCollection() { clear(); };
#if ENABLE_EXTENDED_SELECTION
std::vector<int> load_object(
const ModelObject *model_object,
int obj_idx,
const std::vector<int> &instance_idxs,
const std::string &color_by,
bool use_VBOs);
#else
std::vector<int> load_object(
const ModelObject *model_object,
int obj_idx,
@ -445,6 +453,7 @@ public:
const std::string &select_by,
const std::string &drag_by,
bool use_VBOs);
#endif // ENABLE_EXTENDED_SELECTION
int load_wipe_tower_preview(
int obj_idx, float pos_x, float pos_y, float width, float depth, float height, float rotation_angle, bool use_VBOs, bool size_unknown, float brim_width);