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>2012-02-03 05:30:21 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-03 05:30:21 +0400
commit075fee4d58a65b4313bb7e984ae195690f4c7bfd (patch)
treee801da2591eda34a4c4c7fd5436ff476353b1c55 /release/scripts/modules
parent68cc7e168207c4c519f54f7e0f7f638768386cd0 (diff)
parent050963b6a9529e0abdd597d163ddc4343c0b15c2 (diff)
svn merge ^/trunk/blender -r43830:43864
Diffstat (limited to 'release/scripts/modules')
-rw-r--r--release/scripts/modules/bpy_extras/object_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py
index c9c1dc05476..66b774e6301 100644
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -44,7 +44,7 @@ def add_object_align_init(context, operator):
properties = operator.properties if operator is not None else None
space_data = context.space_data
- if space_data.type != 'VIEW_3D':
+ if space_data and space_data.type != 'VIEW_3D':
space_data = None
# location