3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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.cpp
View file

@ -693,6 +693,14 @@ void GLVolume::generate_layer_height_texture(const PrintObject *print_object, bo
#define LAYER_HEIGHT_TEXTURE_WIDTH 1024
#define LAYER_HEIGHT_TEXTURE_HEIGHT 1024
#if ENABLE_EXTENDED_SELECTION
std::vector<int> GLVolumeCollection::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> GLVolumeCollection::load_object(
const ModelObject *model_object,
int obj_idx,
@ -701,6 +709,7 @@ std::vector<int> GLVolumeCollection::load_object(
const std::string &select_by,
const std::string &drag_by,
bool use_VBOs)
#endif // ENABLE_EXTENDED_SELECTION
{
static float colors[4][4] = {
{ 1.0f, 1.0f, 0.0f, 1.f },