Browse Source

tkpanels: work around tkinter bug cancelling file open dialog on macOS

Fixes #811
rdb 6 years ago
parent
commit
7ca66bfe6f

+ 1 - 1
direct/src/tkpanels/AnimPanel.py

@@ -276,7 +276,7 @@ class AnimPanel(AppShell):
             title = 'Load Animation',
             title = 'Load Animation',
             parent = self.component('hull')
             parent = self.component('hull')
             )
             )
-        if not animFilename:
+        if not animFilename and animFilename != 'None':
             # no file selected, canceled
             # no file selected, canceled
             return
             return
 
 

+ 1 - 1
direct/src/tkpanels/MopathRecorder.py

@@ -1638,7 +1638,7 @@ class MopathRecorder(AppShell, DirectObject):
             initialdir = path,
             initialdir = path,
             title = 'Load Nurbs Curve',
             title = 'Load Nurbs Curve',
             parent = self.parent)
             parent = self.parent)
-        if mopathFilename:
+        if mopathFilename and mopathFilename != 'None':
             self.reset()
             self.reset()
             nodePath = loader.loadModel(
             nodePath = loader.loadModel(
                 Filename.fromOsSpecific(mopathFilename))
                 Filename.fromOsSpecific(mopathFilename))

+ 1 - 1
direct/src/tkpanels/ParticlePanel.py

@@ -1272,7 +1272,7 @@ class ParticlePanel(AppShell):
             initialdir = path,
             initialdir = path,
             title = 'Load Particle Effect',
             title = 'Load Particle Effect',
             parent = self.parent)
             parent = self.parent)
-        if particleFilename:
+        if particleFilename and particleFilename != 'None':
             # Delete existing particles and forces
             # Delete existing particles and forces
             self.particleEffect.loadConfig(
             self.particleEffect.loadConfig(
                 Filename.fromOsSpecific(particleFilename))
                 Filename.fromOsSpecific(particleFilename))