Fixed conflicts after merge with master

This commit is contained in:
Enrico Turri
2019-04-02 15:13:26 +02:00
26 changed files with 368 additions and 256 deletions

View File

@@ -390,6 +390,7 @@ public:
int instance_idx() const { return this->composite_id.instance_id; }
Transform3d world_matrix() const;
bool is_left_handed() const;
const BoundingBoxf3& transformed_bounding_box() const;
const BoundingBoxf3& transformed_convex_hull_bounding_box() const;