diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-07-29 04:44:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-29 04:44:53 +0400 |
commit | 88cbcb0206b7f727b24c6018a24dc1c1a08e9531 (patch) | |
tree | a34fbde02388481dcf6f54a614e6735c6b6a1cdc /source/blender/editors | |
parent | 7ef2e33ea331561691fbc189fa88d34f77ef896e (diff) |
bugfix [#23062] Resolve conflict button in text editor dissappers in Blener 2.5 beta release
also uncommented console some code for testing by mistake & remove warning.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_text/text_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 91fb616a63f..25726bae84b 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -218,7 +218,7 @@ static int open_exec(bContext *C, wmOperator *op) PropertyPointerRNA *pprop; PointerRNA idptr; char str[FILE_MAX]; - short internal = RNA_int_get(op->ptr, "internal"); + short internal = RNA_boolean_get(op->ptr, "internal"); RNA_string_get(op->ptr, "filepath", str); |