Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-08-08 07:31:25 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-08-08 07:31:25 +0400
commit0160901c90f0db6ad615af31dd8c9201b660257f (patch)
tree2a7093bbbe8804f665334932317fa30f305a6d4f /release
parentfad243a4bfd0414b0f8656c570c23ba72012cd40 (diff)
- update X3D and FBX testing checksums
- building with GHOST/SDL now adds the PREFIX - image.external_edit operator errors out if the filepath isnt set (was annoying and loaded gimp while running tests)
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_operators/image.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py
index 23bafe2eaae..aca9b581b97 100644
--- a/release/scripts/startup/bl_operators/image.py
+++ b/release/scripts/startup/bl_operators/image.py
@@ -61,13 +61,19 @@ class EditExternally(bpy.types.Operator):
def execute(self, context):
import os
import subprocess
- filepath = os.path.normpath(bpy.path.abspath(self.filepath))
+
+ filepath = self.filepath
+
+ if not filepath:
+ self.report({'ERROR'}, "Image path not set")
+ return {'CANCELLED'}
+
+ filepath = os.path.normpath(bpy.path.abspath(filepath))
if not os.path.exists(filepath):
self.report({'ERROR'},
"Image path %r not found, image may be packed or "
"unsaved." % filepath)
-
return {'CANCELLED'}
cmd = self._editor_guess(context) + [filepath]