Skip to content

Update Blender plugin Python 3.9 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
diegogangl wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Update Blender plugin Python 3.9 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Pandora/Plugins/Apps/Blender/Integration/PandoraInit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
pandoraRoot = PANDORAROOT


if sys.version_info[0] != 3 and sys.version_info[1] != 7:
print("Pandora supports Python37 only in Blender")
if sys.version_info[0] != 3 and sys.version_info[1] != 9:
print("Pandora supports Python39 only in Blender")

sys.path.insert(0, os.path.join(pandoraRoot, "PythonLibs", "CrossPlatform"))
sys.path.insert(0, os.path.join(pandoraRoot, "PythonLibs", "Python37"))
sys.path.insert(0, os.path.join(pandoraRoot, "PythonLibs", "Python37", "PySide"))
sys.path.insert(0, os.path.join(pandoraRoot, "PythonLibs", "Python39"))
sys.path.insert(0, os.path.join(pandoraRoot, "PythonLibs", "Python39", "PySide"))
sys.path.insert(0, os.path.join(pandoraRoot, "Scripts"))

from PySide2.QtCore import *
Expand Down
2 changes: 1 addition & 1 deletion Pandora/Scripts/PandoraCoordinator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
from functools import wraps

if sys.version[0] == "3":
pyLibs = "Python37"
pyLibs = "Python39"
pVersion = 3
else:
pyLibs = "Python27"
Expand Down
8 changes: 4 additions & 4 deletions Pandora/Scripts/PandoraCore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

# check if python 2 or python 3 is used
if sys.version[0] == "3":
pyLibs = "Python37"
pyLibs = "Python39"
pVersion = 3
else:
pyLibs = "Python27"
Expand Down Expand Up @@ -1826,7 +1826,7 @@ def handleRemoveReadonly(self, func, path, exc):
@err_decorator
def getPythonPath(self):
if platform.system() == "Windows":
pythonPath = os.path.join(self.pandoraRoot, "Python37", "pythonw.exe")
pythonPath = os.path.join(self.pandoraRoot, "Python39", "pythonw.exe")
if not os.path.exists(pythonPath):
pythonPath = os.path.join(self.pandoraRoot, "Python27", "pythonw.exe")
if not os.path.exists(pythonPath):
Expand Down Expand Up @@ -1854,7 +1854,7 @@ def sendEmail(self, text, subject="Pandora Error", quiet=False):

try:
if platform.system() == "Windows":
pythonPath = os.path.join(self.pandoraRoot, "Python37", "pythonw.exe")
pythonPath = os.path.join(self.pandoraRoot, "Python39", "pythonw.exe")
if not os.path.exists(pythonPath):
pythonPath = os.path.join(os.path.dirname(sys.executable), "pythonw.exe")
if not os.path.exists(pythonPath):
Expand Down Expand Up @@ -1949,7 +1949,7 @@ def checkForUpdates(self, silent=False):
try:
import os, sys

pyLibs = os.path.join('%s', 'PythonLibs', 'Python37')
pyLibs = os.path.join('%s', 'PythonLibs', 'Python39')
if pyLibs not in sys.path:
sys.path.insert(0, pyLibs)

Expand Down
2 changes: 1 addition & 1 deletion Pandora/Scripts/PandoraInstaller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

if sys.version[0] == "3":
pVersion = 3
pyLibs = "Python37"
pyLibs = "Python39"
else:
pVersion = 2
pyLibs = "Python27"
Expand Down
2 changes: 1 addition & 1 deletion Pandora/Scripts/PandoraRenderHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
sys.path.append(scriptPath)

if sys.version[0] == "3":
pyLibs = "Python37"
pyLibs = "Python39"
pVersion = 3
else:
pyLibs = "Python27"
Expand Down
2 changes: 1 addition & 1 deletion Pandora/Scripts/PandoraSettings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
sys.path.append(scriptPath)

if sys.version[0] == "3":
pyLibs = "Python37"
pyLibs = "Python39"
pVersion = 3
else:
pyLibs = "Python27"
Expand Down
2 changes: 1 addition & 1 deletion Pandora/Scripts/PandoraSlave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
sys.path.append(scriptPath)

if sys.version[0] == "3":
pyLibs = "Python37"
pyLibs = "Python39"
pVersion = 3
else:
pyLibs = "Python27"
Expand Down
2 changes: 1 addition & 1 deletion Pandora/Scripts/PandoraTray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import sys, os, subprocess, shutil, socket

if sys.version[0] == "3":
pyLibs = "Python37"
pyLibs = "Python39"
pVersion = 3
else:
pyLibs = "Python27"
Expand Down