diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /release/scripts/startup/bl_operators/image.py | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'release/scripts/startup/bl_operators/image.py')
| -rw-r--r-- | release/scripts/startup/bl_operators/image.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py index 1653459bd71..f00f5d97c5e 100644 --- a/release/scripts/startup/bl_operators/image.py +++ b/release/scripts/startup/bl_operators/image.py @@ -33,7 +33,8 @@ class EditExternally(Operator): subtype='FILE_PATH', ) - def _editor_guess(self, context): + @staticmethod + def _editor_guess(context): import sys image_editor = context.user_preferences.filepaths.image_editor |