TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #811
This commit is contained in:
rdb 2020-01-02 01:06:03 +01:00
parent 2b9cc61d04
commit 7ca66bfe6f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/tkpanels/AnimPanel.py
View File

@ -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

2
direct/src/tkpanels/MopathRecorder.py
View File

@ -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))

2
direct/src/tkpanels/ParticlePanel.py
View File

@ -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))