ENABLE_SHOW_SCENE_LABELS set as default
This commit is contained in:
@@ -1101,11 +1101,7 @@ static inline std::vector<const PrintInstance*> sort_object_instances_by_max_z(c
|
||||
}
|
||||
|
||||
// Produce a vector of PrintObjects in the order of their respective ModelObjects in print.model().
|
||||
#if ENABLE_SHOW_SCENE_LABELS
|
||||
std::vector<const PrintInstance*> sort_object_instances_by_model_order(const Print& print)
|
||||
#else
|
||||
static inline std::vector<const PrintInstance*> sort_object_instances_by_model_order(const Print& print)
|
||||
#endif // ENABLE_SHOW_SCENE_LABELS
|
||||
{
|
||||
// Build up map from ModelInstance* to PrintInstance*
|
||||
std::vector<std::pair<const ModelInstance*, const PrintInstance*>> model_instance_to_print_instance;
|
||||
|
||||
@@ -418,9 +418,7 @@ private:
|
||||
friend class WipeTowerIntegration;
|
||||
};
|
||||
|
||||
#if ENABLE_SHOW_SCENE_LABELS
|
||||
std::vector<const PrintInstance*> sort_object_instances_by_model_order(const Print& print);
|
||||
#endif // ENABLE_SHOW_SCENE_LABELS
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -47,7 +47,5 @@
|
||||
//==================
|
||||
#define ENABLE_2_2_0_BETA1 1
|
||||
|
||||
// Enable showing object/instance info with labels into the 3D scene
|
||||
#define ENABLE_SHOW_SCENE_LABELS (1 && ENABLE_2_2_0_BETA1)
|
||||
|
||||
#endif // _technologies_h_
|
||||
|
||||
Reference in New Issue
Block a user