From 191c1b4046e0cf6563b13b845ac2c7bcd0d5a697 Mon Sep 17 00:00:00 2001 From: "Asad M. Zaman" Date: Fri, 3 Mar 2006 02:47:01 +0000 Subject: [PATCH] changed the maya_egg rules to be more robust --- dtool/pptempl/Template.models.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dtool/pptempl/Template.models.pp b/dtool/pptempl/Template.models.pp index f24fbc2f8d..24afcb076c 100644 --- a/dtool/pptempl/Template.models.pp +++ b/dtool/pptempl/Template.models.pp @@ -89,7 +89,7 @@ $[forscopes lwo_egg,$[patsubst %.lwo %.LWO,%$[EGG_SUFFIX].egg,$[SOURCES]]] #define build_maya_eggs \ - $[forscopes maya_egg,$[patsubst %.ma %.mb,%$[EGG_SUFFIX].egg,$[SOURCES]]] \ + $[forscopes maya_egg,$[patsubst %$[MODEL].ma %$[MODEL].mb ,$[EGG_PREFIX]%$[EGG_SUFFIX].egg,$[SOURCES]]] \ $[forscopes maya_char_egg,$[POLY_MODEL:%=$[EGG_PREFIX]%$[EGG_SUFFIX].egg] $[NURBS_MODEL:%=$[EGG_PREFIX]%$[EGG_SUFFIX].egg]] \ $[forscopes maya_char_egg,$[ANIMS:%=$[EGG_PREFIX]%$[CHAN_SUFFIX].egg]] @@ -313,7 +313,7 @@ $[TAB]lwo2egg $[LWO2EGG_OPTS] -o $[target] $[source] // Egg file generation from Maya files (for unanimated models). #forscopes maya_egg #foreach maya $[SOURCES] - #define target $[or $[TARGET],$[patsubst %.ma %.mb,$[EGG_PREFIX]%$[EGG_SUFFIX].egg,$[maya]]] + #define target $[or $[TARGET],$[patsubst %$[MODEL].ma %$[MODEL].mb,$[EGG_PREFIX]%$[EGG_SUFFIX].egg,$[maya]]] #define source $[maya] $[target] : $[source] $[TAB]maya2egg $[MAYA2EGG_OPTS] -o $[target] $[source]