--- ray/src/util/do_file.tcl 1995/10/17 21:28:20 2.12 +++ ray/src/util/do_file.tcl 1996/07/10 11:48:58 2.14 @@ -3,8 +3,6 @@ # Choose the Rad Input File to work on. # -set rif_glob *.rif - proc preen {} { # clean up radvar global radvar rifname foreach n {objects scene materials illum mkillum render oconv pfilt @@ -169,7 +167,11 @@ proc load_vars {f {vl all}} { # load RIF variables set curmess {Project loaded.} } else { foreach n $vl { - catch {unset radvar($n)} + if [regexp {[a-z][a-z]*} $n] { + set radvar($n) {} + } else { + catch {unset radvar($n)} + } } while {[gets $fi curli] != -1} { if [regexp {^[a-zA-Z][a-zA-Z0-9]* *=} $curli] { @@ -290,10 +292,10 @@ proc newnew f { # create a new RIF } proc do_file w { - global rifname readonly rif_glob curfile curpat + global rifname readonly myglob curfile curpat if {"$w" == "done"} { cd [file dirname $rifname] - set rif_glob $curpat + set myglob(rif) $curpat return } frame $w @@ -314,6 +316,6 @@ proc do_file w { helplink $w.left.new trad file new helplink $w.left.ro trad file readonly getfile -view view_txt -perm \ - -win $w.right -glob [file dirname $rifname]/$rif_glob + -win $w.right -glob [file dirname $rifname]/$myglob(rif) set curfile [file tail $rifname] }