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:
authorThomas Dinges <blender@dingto.org>2011-06-06 16:52:26 +0400
committerThomas Dinges <blender@dingto.org>2011-06-06 16:52:26 +0400
commit111b0bf698fccb6c877aa139aed525e005caf8dd (patch)
tree2798e86cb626e598828bb706583dc9c308b5a5e7 /release
parentfc6dcdf17f6f3c313a9c15fbfd38754edbf8ab64 (diff)
2.5 Text Editor:
* Added back Red Alert for "Resolve External conflicts" warning.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_text.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py
index 5b07e8dc37f..0fc8d937f66 100644
--- a/release/scripts/startup/bl_ui/space_text.py
+++ b/release/scripts/startup/bl_ui/space_text.py
@@ -42,7 +42,7 @@ class TEXT_HT_header(bpy.types.Header):
if text and text.is_modified:
row = layout.row()
- # row.color(redalert)
+ row.alert = True
row.operator("text.resolve_conflict", text="", icon='HELP')
layout.template_ID(st, "text", new="text.new", unlink="text.unlink")