Changeset 5385 for branches/1.4


Ignore:
Timestamp:
May 1, 2015 3:42:17 PM (9 years ago)
Author:
ldelgass
Message:

merge 5372 from trunk

Location:
branches/1.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.4

    • Property svn:mergeinfo changed
      /trunkmerged: 5372
  • branches/1.4/gui/scripts/nanovisviewer.tcl

    r5384 r5385  
    15471547    $inner configure -borderwidth 4
    15481548
    1549     set ::Rappture::NanovisViewer::_settings(-isosurfaceshading) 0
    1550     checkbutton $inner.isosurface \
    1551         -text "Isosurface shading" \
    1552         -variable [itcl::scope _settings(-isosurfaceshading)] \
    1553         -command [itcl::code $this AdjustSetting -isosurfaceshading] \
    1554         -font "Arial 9"
    1555 
    15561549    checkbutton $inner.axes \
    15571550        -text "Axes" \
     
    16221615        -text "Lighting / Material Properties" \
    16231616        -font "Arial 9 bold"
     1617
     1618    checkbutton $inner.isosurface -text "Isosurface shading" -font $fg \
     1619        -variable [itcl::scope _settings(-isosurfaceshading)] \
     1620        -command [itcl::code $this AdjustSetting -isosurfaceshading]
    16241621
    16251622    checkbutton $inner.light2side -text "Two-sided lighting" -font $fg \
Note: See TracChangeset for help on using the changeset viewer.