Changeset 5755


Ignore:
Timestamp:
Jul 18, 2015 11:00:42 AM (9 years ago)
Author:
ldelgass
Message:

Merge r5747,r5754 from trunk

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/1.3

  • branches/1.3/gui/scripts/field.tcl

    r5661 r5755  
    651651# ----------------------------------------------------------------------
    652652itcl::body Rappture::Field::InitHints {} {
     653    # Order of duplicate keys matters here: later entries override
     654    # earlier ones.  For example: camera.position is deprecated in
     655    # favor of about.camera, so about.camera is listed after
     656    # camera.position
    653657    foreach {key path} {
    654658        camera          camera.position
     659        camera          about.camera
    655660        color           about.color
    656661        default         about.default

  • branches/1.3/gui/scripts/vtkheightmapviewer.tcl

    r5348 r5755  
    14901490            ResetAxes
    14911491            SendCmd "dataset scalar $_curFldName"
    1492             SendCmd "heightmap colormode scalar $_curFldName"
     1492            SendCmd "heightmap colormode $_colorMode $_curFldName"
    14931493            Zoom reset
    14941494            UpdateContourList
Note: See TracChangeset for help on using the changeset viewer.