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:
authorDalai Felinto <dfelinto@gmail.com>2017-03-09 19:10:06 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-03-09 19:10:06 +0300
commit8a6d055f3734c8a0bfeb9b6256d25bfb414634e6 (patch)
tree17ec0b453d351f56d3a3511b9d50773f1fc8271f /source/blender/editors/space_text/text_draw.c
parent528cb8877f3c8923752a016854682722708c47a0 (diff)
parent6c942db30dee14eb37229879656fa049a9ac6df6 (diff)
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_text/text_draw.c')
-rw-r--r--source/blender/editors/space_text/text_draw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c
index 30b607e063d..1ae72f2e3e7 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -925,6 +925,7 @@ static void draw_textscroll(const SpaceText *st, rcti *scroll, rcti *back)
/*********************** draw documentation *******************************/
+#if 0
static void draw_documentation(const SpaceText *st, ARegion *ar)
{
TextDrawContext tdc = {0};
@@ -1013,6 +1014,7 @@ static void draw_documentation(const SpaceText *st, ARegion *ar)
draw_documentation(st, ar);
}
}
+#endif
/*********************** draw suggestion list *******************************/
@@ -1486,7 +1488,7 @@ void draw_text_main(SpaceText *st, ARegion *ar)
/* draw other stuff */
draw_brackets(st, &tdc, ar);
draw_textscroll(st, &scroll, &back);
- draw_documentation(st, ar);
+ /* draw_documentation(st, ar); - No longer supported */
draw_suggestion_list(st, &tdc, ar);
text_font_end(&tdc);