From ea1386b007f28f3a91acaaf0861863bb6f67821c Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 8 Nov 2006 23:16:20 +0000 Subject: [PATCH] add MAYA_EXTENSION --- dtool/pptempl/Global.pp | 5 +++++ dtool/pptempl/Template.models.pp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp index 57fea03c04..5e467b6852 100644 --- a/dtool/pptempl/Global.pp +++ b/dtool/pptempl/Global.pp @@ -329,6 +329,11 @@ #define BUILD_DIRECTORY 1 #define BUILD_TARGET 1 +// This is the default extension for a Maya file. It might be +// overridden within a maya_char_egg rule to convert a .ma file +// instead. +#define MAYA_EXTENSION .mb + // This variable, when evaluated in the scope of a particular directory, // will indicate true (i.e. nonempty) when the directory is truly built, // or false (empty) when the directory is not to be built. diff --git a/dtool/pptempl/Template.models.pp b/dtool/pptempl/Template.models.pp index 73310f02f6..df29982884 100644 --- a/dtool/pptempl/Template.models.pp +++ b/dtool/pptempl/Template.models.pp @@ -325,13 +325,13 @@ $[TAB]maya2egg $[MAYA2EGG_OPTS] -o $[target] $[source] #forscopes maya_char_egg #if $[POLY_MODEL] #define target $[EGG_PREFIX]$[POLY_MODEL].egg - #define source $[MAYA_PREFIX]$[or $[MODEL],$[POLY_MODEL]].mb + #define source $[MAYA_PREFIX]$[or $[MODEL],$[POLY_MODEL]]$[MAYA_EXTENSION] $[target] : $[source] $[TAB]maya2egg $[MAYA2EGG_OPTS] -p -a model -cn "$[CHAR_NAME]" -o $[target] $[source] #endif #if $[NURBS_MODEL] #define target $[EGG_PREFIX]$[NURBS_MODEL].egg - #define source $[MAYA_PREFIX]$[or $[MODEL],$[NURBS_MODEL]].mb + #define source $[MAYA_PREFIX]$[or $[MODEL],$[NURBS_MODEL]]$[MAYA_EXTENSION] $[target] : $[source] $[TAB]maya2egg $[MAYA2EGG_OPTS] -a model -cn "$[CHAR_NAME]" -o $[target] $[source] #endif @@ -342,7 +342,7 @@ $[TAB]maya2egg $[MAYA2EGG_OPTS] -a model -cn "$[CHAR_NAME]" -o $[target] $[sourc #forscopes maya_char_egg #foreach anim $[ANIMS] #define target $[EGG_PREFIX]$[anim]$[CHAN_SUFFIX].egg - #define source $[MAYA_PREFIX]$[anim].mb + #define source $[MAYA_PREFIX]$[anim]$[MAYA_EXTENSION] #define begin 0 #define end #if $[$[anim]_frames]