Merge branch 'master' into solve_optimizer
This commit is contained in:
commit
0ec56f1eb8
1 changed files with 4 additions and 1 deletions
|
@ -46,7 +46,7 @@ from .utils.object_transforms import apply_transforms
|
||||||
from .material_generators import material_generator, black_material
|
from .material_generators import material_generator, black_material
|
||||||
from .utils.object_converter import mesh_to_mesh
|
from .utils.object_converter import mesh_to_mesh
|
||||||
from .export import dae, fbx, glb, ply
|
from .export import dae, fbx, glb, ply
|
||||||
|
import .export.obj as obj_export
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
@ -188,6 +188,9 @@ def generate_libs_database(project_dir):
|
||||||
'ply': os.path.relpath(
|
'ply': os.path.relpath(
|
||||||
ply.export(obj_name=part['name'], file_dir=objects_dir),
|
ply.export(obj_name=part['name'], file_dir=objects_dir),
|
||||||
project_dir),
|
project_dir),
|
||||||
|
'obj': os.path.relpath(
|
||||||
|
obj_export.export(obj_name=part['name'], file_dir=objects_dir),
|
||||||
|
project_dir),
|
||||||
'thumbnail': os.path.relpath(img_path, project_dir),
|
'thumbnail': os.path.relpath(img_path, project_dir),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue