From f8bdc2d886f56fa866d92732d528fa115f996675 Mon Sep 17 00:00:00 2001 From: Chris Brunner Date: Thu, 19 Nov 2009 03:24:56 +0000 Subject: [PATCH] adding a variable for maya2egg to allow for alternate binary names (e.g. maya2egg_client) --- dtool/Config.pp | 2 ++ dtool/pptempl/Template.models.pp | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dtool/Config.pp b/dtool/Config.pp index 7872defb65..39fd646f05 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -963,6 +963,8 @@ // Define this if your version of Maya is earlier than 5.0 (e.g. Maya 4.5). #define MAYA_PRE_5_0 +#define MAYA2EGG maya2egg + // In the same fashion as mayaegg converter above, set softimage to egg converter as well #define SOFTIMAGE_LOCATION /c/Softimage/sdk_18sp2/SDK_1.8SP2/SAAPHIRE #defer SOFTIMAGE_LIBS SAA.lib diff --git a/dtool/pptempl/Template.models.pp b/dtool/pptempl/Template.models.pp index db440296da..39ac92e307 100644 --- a/dtool/pptempl/Template.models.pp +++ b/dtool/pptempl/Template.models.pp @@ -362,7 +362,7 @@ $[TAB]lwo2egg $[LWO2EGG_OPTS] -o $[target] $[source] #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] +$[TAB]$[MAYA2EGG] $[MAYA2EGG_OPTS] -o $[target] $[source] #end maya #end maya_egg @@ -373,17 +373,17 @@ $[TAB]maya2egg $[MAYA2EGG_OPTS] -o $[target] $[source] #define target $[EGG_PREFIX]$[POLY_MODEL].egg #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] +$[TAB]$[MAYA2EGG] $[MAYA2EGG_OPTS] -p -a model -cn "$[CHAR_NAME]" -o $[target] $[source] #elif $[NURBS_MODEL] #define target $[EGG_PREFIX]$[NURBS_MODEL].egg #define source $[MAYA_PREFIX]$[or $[MODEL],$[NURBS_MODEL]]$[MAYA_EXTENSION] $[target] : $[source] -$[TAB]maya2egg $[MAYA2EGG_OPTS] -a model -cn "$[CHAR_NAME]" -o $[target] $[source] +$[TAB]$[MAYA2EGG] $[MAYA2EGG_OPTS] -a model -cn "$[CHAR_NAME]" -o $[target] $[source] #elif $[not $[or $[MODEL], $[POLY_MODEL], $[ANIMS]]] #define target $[EGG_PREFIX].egg #define source $[MAYA_PREFIX]$[MAYA_EXTENSION] $[target] : $[source] -$[TAB]maya2egg $[MAYA2EGG_OPTS] -p -a model -cn "$[CHAR_NAME]" -o $[target] $[source] +$[TAB]$[MAYA2EGG] $[MAYA2EGG_OPTS] -p -a model -cn "$[CHAR_NAME]" -o $[target] $[source] #endif #end maya_char_egg @@ -400,7 +400,7 @@ $[TAB]maya2egg $[MAYA2EGG_OPTS] -p -a model -cn "$[CHAR_NAME]" -o $[target] $[so #set end $[word 2,$[$[anim]_frames]] #endif $[target] : $[source] -$[TAB]maya2egg $[MAYA2EGG_OPTS] -a chan -cn "$[CHAR_NAME]" -o $[target] -sf $[begin] $[if $[end],-ef $[end]] $[source] +$[TAB]$[MAYA2EGG] $[MAYA2EGG_OPTS] -a chan -cn "$[CHAR_NAME]" -o $[target] -sf $[begin] $[if $[end],-ef $[end]] $[source] #end anim #end maya_char_egg