From 3721b19a6137bb839482016afb8ded5d33056fe1 Mon Sep 17 00:00:00 2001 From: Oliver Nagy Date: Sun, 23 Nov 2014 15:24:17 +1100 Subject: [PATCH] pyassimp/quicktest now runs without installing pyassimp first. --- port/PyAssimp/pyassimp/core.py | 2 +- port/PyAssimp/scripts/quicktest.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/port/PyAssimp/pyassimp/core.py b/port/PyAssimp/pyassimp/core.py index 8a1e6249b..b5b0441ce 100644 --- a/port/PyAssimp/pyassimp/core.py +++ b/port/PyAssimp/pyassimp/core.py @@ -177,7 +177,7 @@ def _init(self, target = None, parent = None): "and quads. Try to load your mesh with" " a post-processing to triangulate your" " faces.") - sys.exit(1) + raise e else: # starts with 'm' but not iterable diff --git a/port/PyAssimp/scripts/quicktest.py b/port/PyAssimp/scripts/quicktest.py index 4f45b2984..1133c4689 100755 --- a/port/PyAssimp/scripts/quicktest.py +++ b/port/PyAssimp/scripts/quicktest.py @@ -9,8 +9,12 @@ data structures in detail. It just verifies whether basic loading and querying of 3d models using pyassimp works. """ +import os +import sys + +# Make the development (ie. GIT repo) version of PyAssimp available for import. +sys.path.insert(0, '..') -import sys,os import sample from pyassimp import errors