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:
authorInes Almeida <britalmeida@gmail.com>2018-10-13 20:49:26 +0300
committerInes Almeida <britalmeida@gmail.com>2018-10-13 20:49:26 +0300
commitab62b7e971ab446c8c286fac305a846f83161e50 (patch)
tree7fd5a67b9653e2e10efee94374e812e76da86a05 /source/blender/blenkernel/intern/font.c
parentcc8424e73324b772621045c1856f9a8869faa859 (diff)
parentdd6bf3f84a9137affbcd8ba0fc957c32b8c0aff7 (diff)
Merge branch 'origin/blender2.8' into temp-ui-layout-2.8temp-ui-layout-2.8
Diffstat (limited to 'source/blender/blenkernel/intern/font.c')
-rw-r--r--source/blender/blenkernel/intern/font.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index b81d633f156..51ab82fd593 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -1118,7 +1118,7 @@ makebreak:
/* Note: Only OB_CURVE objects could have a path */
if (cu->textoncurve && cu->textoncurve->type == OB_CURVE) {
BLI_assert(cu->textoncurve->runtime.curve_cache != NULL);
- if (cu->textoncurve->runtime.curve_cache->path) {
+ if (cu->textoncurve->runtime.curve_cache != NULL && cu->textoncurve->runtime.curve_cache->path != NULL) {
float distfac, imat[4][4], imat3[3][3], cmat[3][3];
float minx, maxx, miny, maxy;
float timeofs, sizefac;