mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-29 08:13:14 +00:00
Merge remote-tracking branch 'origin/v0.8.0' into datamodel-v1.0
This commit is contained in:
@@ -30,6 +30,8 @@
|
||||
#include "../ifcparse/utils.h"
|
||||
|
||||
// undefine opencascade Handle macro, because it conflicts with USD
|
||||
// Macro source code lives in Standard_Handle.hxx.
|
||||
#pragma push_macro("Handle")
|
||||
#undef Handle
|
||||
|
||||
#include "pxr/pxr.h"
|
||||
@@ -38,6 +40,9 @@
|
||||
#include "pxr/usd/usdGeom/mesh.h"
|
||||
#include "pxr/usd/usdShade/material.h"
|
||||
|
||||
// redefine Handle macro.
|
||||
#pragma pop_macro("Handle")
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <algorithm>
|
||||
|
||||
@@ -32,6 +32,7 @@ WaveFrontOBJSerializer::WaveFrontOBJSerializer(const stream_or_filename& obj_fil
|
||||
, obj_stream(obj_filename)
|
||||
, mtl_stream(mtl_filename)
|
||||
, vcount_total(1)
|
||||
, ncount_total(1)
|
||||
{
|
||||
obj_stream.stream << std::setprecision(settings.get<ifcopenshell::geometry::settings::FloatingPointDigits>().get());
|
||||
mtl_stream.stream << std::setprecision(settings.get<ifcopenshell::geometry::settings::FloatingPointDigits>().get());
|
||||
|
||||
Reference in New Issue
Block a user