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:
authorIan Thompson <quornian@googlemail.com>2008-08-17 13:46:47 +0400
committerIan Thompson <quornian@googlemail.com>2008-08-17 13:46:47 +0400
commit5c2015fa89ef658b9e624c746f0bb61ee78ea932 (patch)
tree5b36bc5de1137f32bace77da6dac2c29845667ed
parent9b6dffad2d636e6e1c06845cd3114c2a40d9a413 (diff)
Fix for fix. Forgot to check if markers exist before trying to clear. Oops
-rw-r--r--source/blender/blenkernel/intern/text.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 7802a1af1da..35422353b0d 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -991,7 +991,7 @@ static void txt_delete_sel (Text *text)
move= txt_get_span(text->curl, text->sell);
} else {
mrk= txt_find_marker_region(text, text->curl, text->curc, text->selc, 0);
- if (mrk->start > text->curc || mrk->end < text->selc)
+ if (mrk && (mrk->start > text->curc || mrk->end < text->selc))
txt_clear_marker_region(text, text->curl, text->curc, text->selc, 0);
move= 0;
}