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:
authorXiao Xiangquan <xiaoxiangquan@gmail.com>2011-08-10 18:32:03 +0400
committerXiao Xiangquan <xiaoxiangquan@gmail.com>2011-08-10 18:32:03 +0400
commit465c3b82fa8320c0366eaa72b2319c8b42f9c8f1 (patch)
tree9d458a8e0fdd9f12f3cb03eeeab246ca2523a707 /release/scripts/startup/bl_ui/properties_data_empty.py
parent16deef9e79721d3525244eaef11190b5ff0fd58b (diff)
parent22694c993a7e32767db4719e9fa37e93445b66a8 (diff)
merge with trunk r39216
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_data_empty.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_empty.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py
index 377f637e72c..4ed1d23f814 100644
--- a/release/scripts/startup/bl_ui/properties_data_empty.py
+++ b/release/scripts/startup/bl_ui/properties_data_empty.py
@@ -41,11 +41,9 @@ class DATA_PT_empty(DataButtonsPanel, bpy.types.Panel):
layout.prop(ob, "empty_draw_type", text=_("Display"))
if ob.empty_draw_type == 'IMAGE':
- # layout.template_image(ob, "data", None)
layout.template_ID(ob, "data", open="image.open", unlink="image.unlink")
- row = layout.row(align=True)
- row.prop(ob, "color", text=_("Transparency"), index=3, slider=True)
+ layout.prop(ob, "color", text=_("Transparency"), index=3, slider=True)
row = layout.row(align=True)
row.prop(ob, "empty_image_offset", text=_("Offset X"), index=0)
row.prop(ob, "empty_image_offset", text=_("Offset Y"), index=1)