diff --git a/dtool/pptempl/Template.models.pp b/dtool/pptempl/Template.models.pp index 9d7e8f26f8..942efed3a6 100644 --- a/dtool/pptempl/Template.models.pp +++ b/dtool/pptempl/Template.models.pp @@ -287,14 +287,14 @@ $[TAB]multify xf $[source] -C $[DATABASE] #define scene $[SCENE_PREFIX]$[MODEL].1-0.dsc #define source $[DATABASE]/SCENES/$[scene] $[target] : $[source] -$[TAB]soft -D libsoftegg soft2egg $[SOFT2EGG_OPTS] -p -M $[target] -N $[CHAR_NAME] -d $[DATABASE] -t $[DATABASE]/PICTURES -s $[scene] +$[TAB]soft -D libsoftegg soft2egg $[SOFT2EGG_OPTS] $[if $[SOFTIMAGE_RSRC],-r "$[osfilename $[SOFTIMAGE_RSRC]]"] -p -M $[target] -N $[CHAR_NAME] -d $[DATABASE] -t $[DATABASE]/PICTURES -s $[scene] #endif #if $[NURBS_MODEL] #define target $[EGG_PREFIX]$[NURBS_MODEL].egg #define scene $[SCENE_PREFIX]$[MODEL].1-0.dsc #define source $[DATABASE]/SCENES/$[scene] $[target] : $[source] -$[TAB]soft -D libsoftegg soft2egg $[SOFT2EGG_OPTS] -n -M $[target] -N $[CHAR_NAME] -d $[DATABASE] -t $[DATABASE]/PICTURES -s $[scene] +$[TAB]soft -D libsoftegg soft2egg $[SOFT2EGG_OPTS] $[if $[SOFTIMAGE_RSRC],-r "$[osfilename $[SOFTIMAGE_RSRC]]"] -n -M $[target] -N $[CHAR_NAME] -d $[DATABASE] -t $[DATABASE]/PICTURES -s $[scene] #endif #end soft_char_egg @@ -312,7 +312,7 @@ $[TAB]soft -D libsoftegg soft2egg $[SOFT2EGG_OPTS] -n -M $[target] -N $[CHAR_NAM #set end $[word 2,$[$[anim]_frames]] #endif $[target] : $[source] -$[TAB]soft -D libsoftegg soft2egg $[SOFT2EGG_OPTS] -a -A $[target] -N $[CHAR_NAME] -d $[DATABASE] -s $[scene] $[begin:%=-b%] $[end:%=-e%] +$[TAB]soft -D libsoftegg soft2egg $[SOFT2EGG_OPTS] $[if $[SOFTIMAGE_RSRC],-r "$[osfilename $[SOFTIMAGE_RSRC]]"] -a -A $[target] -N $[CHAR_NAME] -d $[DATABASE] -s $[scene] $[begin:%=-b%] $[end:%=-e%] #end anim #end soft_char_egg