Ignore:
Timestamp:
Nov 9, 2014 7:14:52 PM (10 years ago)
Author:
ldelgass
Message:

merge r4642 from trunk

Location:
branches/1.3
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4642

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

    r4670 r4676  
    10591059        }
    10601060        if { [array size _fields] < 2 } {
    1061             blt::table forget $itk_component(field) $itk_component(field_l)
     1061            catch {blt::table forget $itk_component(field) $itk_component(field_l)}
    10621062        }
    10631063        set _reset 0

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

    r4670 r4676  
    10951095            -numisolines
    10961096        if { [array size _fields] < 2 } {
    1097             blt::table forget $itk_component(field) $itk_component(field_l)
     1097            catch {blt::table forget $itk_component(field) $itk_component(field_l)}
    10981098        }
    10991099        RequestLegend

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

    r4670 r4676  
    10631063            axisVisible axisLabels field view3D
    10641064        if { [array size _fields] < 2 } {
    1065             blt::table forget $itk_component(field) $itk_component(field_l)
     1065            catch {blt::table forget $itk_component(field) $itk_component(field_l)}
    10661066        }
    10671067        RequestLegend

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

    r4674 r4676  
    10701070        }
    10711071        if { [array size _fields] < 2 } {
    1072             blt::table forget $itk_component(field) $itk_component(field_l)
     1072            catch {blt::table forget $itk_component(field) $itk_component(field_l)}
    10731073        }
    10741074        set _reset 0

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

    r4670 r4676  
    10111011        }
    10121012        if { [array size _fields] < 2 } {
    1013             blt::table forget $itk_component(field) $itk_component(field_l)
     1013            catch {blt::table forget $itk_component(field) $itk_component(field_l)}
    10141014        }
    10151015        set _reset 0
Note: See TracChangeset for help on using the changeset viewer.