Fixed forward declaration of enums, made volumes with negative ID

directly unselectable.
This commit is contained in:
bubnikv 2018-11-13 18:44:30 +01:00
parent 03875e7d71
commit 88445f98f0
3 changed files with 4 additions and 4 deletions

View File

@ -6,13 +6,13 @@
namespace Slic3r { namespace Slic3r {
enum SLAPrintStep { enum SLAPrintStep : unsigned int {
slapsRasterize, slapsRasterize,
slapsValidate, slapsValidate,
slapsCount slapsCount
}; };
enum SLAPrintObjectStep { enum SLAPrintObjectStep : unsigned int {
slaposObjectSlice, slaposObjectSlice,
slaposSupportIslands, slaposSupportIslands,
slaposSupportPoints, slaposSupportPoints,

View File

@ -18,7 +18,7 @@ class Print;
class PrintObject; class PrintObject;
class SLAPrint; class SLAPrint;
class SLAPrintObject; class SLAPrintObject;
enum SLAPrintObjectStep; enum SLAPrintObjectStep : unsigned int;
class Model; class Model;
class ModelObject; class ModelObject;
class GCodePreviewData; class GCodePreviewData;

View File

@ -1220,7 +1220,7 @@ void GLCanvas3D::Selection::add(unsigned int volume_idx, bool as_single_selectio
{ {
case Volume: case Volume:
{ {
if (is_empty() || (volume->instance_idx() == get_instance_idx())) if (volume->volume_idx() >= 0 && (is_empty() || (volume->instance_idx() == get_instance_idx())))
_add_volume(volume_idx); _add_volume(volume_idx);
break; break;