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:
authorJason Hays <jason_hays22@mymail.eku.edu>2011-09-19 19:36:30 +0400
committerJason Hays <jason_hays22@mymail.eku.edu>2011-09-19 19:36:30 +0400
commit2cbf475fb2c3c020029e1704c8e6cee04a267323 (patch)
tree5b09e590e1f6b0736cf5e7ec73d905f04c90a72a /release/scripts/modules/bpy_extras/io_utils.py
parent94016ed285c351605057929139caf9b636b179b6 (diff)
parentd78231734d6ccf224738ea76307c26f8c0d4dab4 (diff)
Merged 40338-40364soc-2011-radish
Diffstat (limited to 'release/scripts/modules/bpy_extras/io_utils.py')
-rw-r--r--release/scripts/modules/bpy_extras/io_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/modules/bpy_extras/io_utils.py b/release/scripts/modules/bpy_extras/io_utils.py
index 3f6a3682e7c..91546e02829 100644
--- a/release/scripts/modules/bpy_extras/io_utils.py
+++ b/release/scripts/modules/bpy_extras/io_utils.py
@@ -233,8 +233,8 @@ def axis_conversion(from_forward='Y', from_up='Z', to_forward='Y', to_up='Z'):
return Matrix().to_3x3()
if from_forward[-1] == from_up[-1] or to_forward[-1] == to_up[-1]:
- raise Exception("invalid axis arguments passed, "
- "can't use up/forward on the same axis.")
+ raise Exception("Invalid axis arguments passed, "
+ "can't use up/forward on the same axis")
value = reduce(int.__or__, (_axis_convert_num[a] << (i * 3)
for i, a in enumerate((from_forward,