--- ray/src/util/do_file.tcl 1996/05/17 13:53:07 2.13 +++ ray/src/util/do_file.tcl 1997/08/12 15:19:05 2.15 @@ -73,7 +73,7 @@ proc preen {} { # clean up radvar proc setradvar stmt { # assign a rad variable global radvar - regexp {^([a-zA-Z][a-zA-Z0-9]*) *= *(.*)$} $stmt dummy vnam vval + regexp {^([a-zA-Z][a-zA-Z0-9]*) *=[ ]*(.*)$} $stmt dummy vnam vval switch -glob $vnam { obj* { eval lappend radvar(objects) $vval } sce* { eval lappend radvar(scene) $vval } @@ -158,7 +158,7 @@ proc load_vars {f {vl all}} { # load RIF variables if {"$vl" == "all"} { catch {unset radvar} while {[gets $fi curli] != -1} { - if [regexp {^[a-zA-Z][a-zA-Z0-9]*= } $curli] { + if [regexp {^[a-zA-Z][a-zA-Z0-9]* *=} $curli] { setradvar $curli } else { break @@ -167,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] {