From a9ff8a22f0e76218220010189de375dd48d2741b Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 7 Oct 2018 23:00:17 +0200 Subject: [PATCH] makepanda: enable Assimp in default Confauto.prc if built --- makepanda/confauto.in | 5 +++++ makepanda/makepanda.py | 3 +++ 2 files changed, 8 insertions(+) diff --git a/makepanda/confauto.in b/makepanda/confauto.in index 608a6daf68..41655f1bbc 100644 --- a/makepanda/confauto.in +++ b/makepanda/confauto.in @@ -21,6 +21,11 @@ load-file-type egg pandaegg +# If we built with Assimp support, we can enable the Assimp loader, +# which allows us to load many model formats natively. + +load-file-type p3assimp + # These entries work very similar to load-file-type, except they are # used by the MovieVideo and MovieAudio code to determine which module # should be loaded in order to decode files of the given extension. diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index e371fbd3e8..a81ea7fe56 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2882,6 +2882,9 @@ else: # otherwise, disable it. confautoprc = confautoprc.replace('#st#', '#') +if PkgSkip("ASSIMP"): + confautoprc = confautoprc.replace("load-file-type p3assimp", "#load-file-type p3assimp") + if (os.path.isfile("makepanda/myconfig.in")): configprc = ReadFile("makepanda/myconfig.in") else: