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:
authorJoshua Leung <aligorith@gmail.com>2008-09-05 10:05:25 +0400
committerJoshua Leung <aligorith@gmail.com>2008-09-05 10:05:25 +0400
commit18fe6c27ff2b4a76ec5c646a3dda0a7bd64d94b4 (patch)
tree4d274bf759cb3f65bff2e1e5906784667f228e21 /source/blender/blenkernel/intern/text.c
parent18b5b4ff0c270c328f0fe30e0af9a7ff178247eb (diff)
Compiling/Warning Fixes (for scons/mingw + "split sources hack") Part 1:
* Removed compiler warnings from texteditor work * Added round brackets around the new defines for IPO channels for extra texture layers * Tweaked priorities so that BLI_heap_* functions in blenlib can be found by linker (split-sources specific) TODO: * "monkey*" vars cannot be found still
Diffstat (limited to 'source/blender/blenkernel/intern/text.c')
-rw-r--r--source/blender/blenkernel/intern/text.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 12133fc4fff..5f1a1e63da4 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -2243,7 +2243,7 @@ void txt_delete_char (Text *text)
if ((mrk->flags & TMARK_TEMP) && !(mrk->flags & TMARK_EDITALL)) {
txt_clear_markers(text, mrk->group, TMARK_TEMP);
} else {
- TextMarker *nxt= mrk->next;
+ //TextMarker *nxt= mrk->next;
BLI_freelinkN(&text->markers, mrk);
}
return;
@@ -2308,7 +2308,7 @@ void txt_backspace_char (Text *text)
if ((mrk->flags & TMARK_TEMP) && !(mrk->flags & TMARK_EDITALL)) {
txt_clear_markers(text, mrk->group, TMARK_TEMP);
} else {
- TextMarker *nxt= mrk->next;
+ //TextMarker *nxt= mrk->next;
BLI_freelinkN(&text->markers, mrk);
}
return;