Skip to content

Commit b0992aa

Browse files
committed
Blender: Misc cleanup
1 parent 1434065 commit b0992aa

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/windows/animated_title.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@
4040
from PyQt5.QtWidgets import *
4141
from PyQt5 import uic
4242

43-
from classes import info, ui_util, settings, qt_types, updates
43+
from classes import info, metrics, ui_util, settings, qt_types, updates
4444
from classes.app import get_app
4545
from classes.logger import log
46-
from classes.metrics import *
4746
from windows.views.blender_listview import BlenderListView
4847

4948
import json
@@ -66,7 +65,7 @@ def __init__(self):
6665
ui_util.init_ui(self)
6766

6867
# Track metrics
69-
track_metric_screen("animated-title-screen")
68+
metrics.track_metric_screen("animated-title-screen")
7069

7170
# Add render button
7271
app = get_app()

src/windows/views/blender_listview.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import sys
3232
import re
3333
import functools
34-
import json
3534

3635
# Try to get the security-patched XML functions from defusedxml
3736
try:
@@ -463,13 +462,16 @@ def error_with_blender(self, version=None, command_output=None):
463462
msg = QMessageBox()
464463
msg.setText(_("""
465464
Blender, the free open source 3D content creation suite, is required for this action. (http://www.blender.org)
465+
466466
Please check the preferences in OpenShot and be sure the Blender executable is correct.
467467
This setting should be the path of the 'blender' executable on your computer.
468468
Also, please be sure that it is pointing to Blender version {} or greater.
469+
469470
Blender Path: {}
470471
{}""").format(info.BLENDER_MIN_VERSION,
471472
s.get("blender_command"),
472473
version_message))
474+
473475
msg.exec_()
474476

475477
# Enable the Render button again

0 commit comments

Comments
 (0)