juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-05 19:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes

Browse Source
This commit is contained in:
Enrico Turri
2019-01-31 13:32:47 +01:00
parent 3deeab90f3 1605c23e25
commit 5fa5d495bb
17 changed files with 417 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/Model.cpp
View File

@@ -552,7 +552,7 @@ std::string Model::propose_export_file_name() const
for (const ModelObject *model_object : this->objects)
for (ModelInstance *model_instance : model_object->instances)
if (model_instance->is_printable())
return model_object->input_file;
return model_object->name.empty() ? model_object->input_file : model_object->name;
return std::string();
}
@@ -1686,7 +1686,7 @@ bool model_volume_list_changed(const ModelObject &model_object_old, const ModelO
return false;
}
#ifdef _DEBUG
#ifndef NDEBUG
// Verify whether the IDs of Model / ModelObject / ModelVolume / ModelInstance / ModelMaterial are valid and unique.
void check_model_ids_validity(const Model &model)
{
@@ -1732,6 +1732,6 @@ void check_model_ids_equal(const Model &model1, const Model &model2)
}
}
}
#endif /* _DEBUG */
#endif /* NDEBUG */
}

4
src/libslic3r/Model.hpp
View File

@@ -629,11 +629,11 @@ extern bool model_object_list_extended(const Model &model_old, const Model &mode
// than the old ModelObject.
extern bool model_volume_list_changed(const ModelObject &model_object_old, const ModelObject &model_object_new, const ModelVolume::Type type);
#ifdef _DEBUG
#ifndef NDEBUG
// Verify whether the IDs of Model / ModelObject / ModelVolume / ModelInstance / ModelMaterial are valid and unique.
void check_model_ids_validity(const Model &model);
void check_model_ids_equal(const Model &model1, const Model &model2);
#endif /* _DEBUG */
#endif /* NDEBUG */
}

9
src/libslic3r/Technologies.hpp
View File

@@ -54,3 +54,12 @@
#define ENABLE_ANISOTROPIC_FILTER_ON_BED_TEXTURES (1 && ENABLE_1_42_0_ALPHA4)
// Bunch of fixes related to volumes centering
#define ENABLE_VOLUMES_CENTERING_FIXES (1 && ENABLE_1_42_0_ALPHA4)
//====================
// 1.42.0.alpha5 techs
//====================
#define ENABLE_1_42_0_ALPHA5 1
// Toolbar items hidden/shown in dependence of the user mode
#define ENABLE_MODE_AWARE_TOOLBAR_ITEMS (1 && ENABLE_1_42_0_ALPHA5)