Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

iMSTK
- Activity
- Members
- Labels
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

14cfbb80

Commit 14cfbb80 authored 3 years ago by Andrew Wilson

Downloads
- Plain Diff

Merge branch 'AssimpBugFix' into 'master'

BUG: Ignore segments in triangle mesh reading

See merge request iMSTK/iMSTK!685

parents c11d712c 20edefe5

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Source/CollisionDetection/Testing/imstkCollisionDataTest.cpp 38 additions, 16 deletions

Source/CollisionDetection/Testing/imstkCollisionDataTest.cpp
Source/Common/imstkMath.h 1 addition, 1 deletion

Source/Common/imstkMath.h
Source/Devices/imstkHapticDeviceClient.h 1 addition, 1 deletion

Source/Devices/imstkHapticDeviceClient.h
Source/MeshIO/imstkAssimpMeshIO.cpp 13 additions, 10 deletions

Source/MeshIO/imstkAssimpMeshIO.cpp
Source/Scene/imstkScene.h 1 addition, 2 deletions

Source/Scene/imstkScene.h

with 54 additions and 30 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment