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:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-01-09 22:03:49 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-01-13 13:57:51 +0400
commitf86fbc4ea31f743b8a28d4f91dc2eff209740507 (patch)
treea41e381399d8a50937fa923fa30feeb24ce372d8 /source/blender/blenkernel/BKE_font.h
parent9d882031014abdd6daafe3a1235cd263edbc58fc (diff)
Remove direct displist creation from BKE_vfont_to_curve_ex()
This goes back to ancient era again and such a call isn't safe for threading and really DAG is to make it sure display list for dependencies is always there.
Diffstat (limited to 'source/blender/blenkernel/BKE_font.h')
-rw-r--r--source/blender/blenkernel/BKE_font.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h
index d7c40e8e719..b60c833c686 100644
--- a/source/blender/blenkernel/BKE_font.h
+++ b/source/blender/blenkernel/BKE_font.h
@@ -38,7 +38,6 @@ extern "C" {
#include <wchar.h>
struct VFont;
-struct Scene;
struct Object;
struct Curve;
struct objfnt;
@@ -85,13 +84,13 @@ void BKE_vfont_free(struct VFont *sc);
struct VFont *BKE_vfont_builtin_get(void);
struct VFont *BKE_vfont_load(struct Main *bmain, const char *name);
-bool BKE_vfont_to_curve_ex(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode,
+bool BKE_vfont_to_curve_ex(struct Main *bmain, struct Object *ob, int mode,
struct ListBase *r_nubase,
const wchar_t **r_text, int *r_text_len, bool *r_text_free,
struct CharTrans **r_chartransdata);
-bool BKE_vfont_to_curve_nubase(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode,
+bool BKE_vfont_to_curve_nubase(struct Main *bmain, struct Object *ob, int mode,
struct ListBase *r_nubase);
-bool BKE_vfont_to_curve(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode);
+bool BKE_vfont_to_curve(struct Main *bmain, struct Object *ob, int mode);
int BKE_vfont_select_get(struct Object *ob, int *r_start, int *r_end);