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:
authorNicholas Bishop <nicholasbishop@gmail.com>2010-10-18 06:43:53 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2010-10-18 06:43:53 +0400
commit08232350d5797302e3638e69ec78657d853976aa (patch)
treead5ff38236343cdcb5eee6d8c6711cb1b32a1912 /release/scripts/ui/space_image.py
parent5b31d545dfae5ee3fd5f4a5d0e9497a1c7c2a86b (diff)
parenta6d62bf0db09ae2759fd45abb3af563fefc13690 (diff)
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32200:32300
Diffstat (limited to 'release/scripts/ui/space_image.py')
-rw-r--r--release/scripts/ui/space_image.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py
index 7b3954a2e74..d2e5046c816 100644
--- a/release/scripts/ui/space_image.py
+++ b/release/scripts/ui/space_image.py
@@ -391,7 +391,7 @@ class IMAGE_PT_game_properties(bpy.types.Panel):
col.prop(ima, "use_tiles")
sub = col.column(align=True)
- sub.active = ima.tiles or ima.use_animation
+ sub.active = ima.use_tiles or ima.use_animation
sub.prop(ima, "tiles_x", text="X")
sub.prop(ima, "tiles_y", text="Y")