soft2egg references

dtool/pptempl/Global.pp

@@ -67,6 +67,13 @@
 // And this lets us look up source directories by dirname.
 #map dirnames DIRNAME(*/)
 
+// This is used by Template.models.pp.
+#if $[HAVE_SOFTIMAGE]
+  #define SOFT2EGG soft -D libsoftegg soft2egg
+#else
+  // Temporary: use the old converter from pre-Panda days.
+  #define SOFT2EGG soft2egg
+#endif
 
 // Define some various compile flags, derived from the variables set
 // in Config.pp.

dtool/pptempl/Template.models.pp

@@ -288,14 +288,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] $[if $[SOFTIMAGE_RSRC],-r "$[osfilename $[SOFTIMAGE_RSRC]]"] -p -M $[target] -N $[CHAR_NAME] -d $[DATABASE] -t $[DATABASE]/PICTURES -s $[scene]
+$[TAB]$[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] $[if $[SOFTIMAGE_RSRC],-r "$[osfilename $[SOFTIMAGE_RSRC]]"] -n -M $[target] -N $[CHAR_NAME] -d $[DATABASE] -t $[DATABASE]/PICTURES -s $[scene]
+$[TAB]$[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
@@ -313,7 +313,7 @@ $[TAB]soft -D libsoftegg soft2egg $[SOFT2EGG_OPTS] $[if $[SOFTIMAGE_RSRC],-r "$[
       #set end $[word 2,$[$[anim]_frames]]
     #endif
 $[target] : $[source]
-$[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%]
+$[TAB]$[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