diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-01 15:16:41 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-01 15:16:41 +0300 |
| commit | 936d1cef6e6124a8f8f3ce50182afa2e1c947c6f (patch) | |
| tree | 429a7503472bd8fe38ceb062086e447cb3a83423 /source/blender/modifiers | |
| parent | 4e6bcd10e559ab541df53a3d7b645faac1a7fe27 (diff) | |
| parent | ddd62f1b1063d69df5171c7b3457ffcffcc6b0e4 (diff) | |
Merge branch 'blender2.8' into soc-2018-bevel
Conflicts:
release/scripts/addons
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/space_outliner/outliner_draw.c
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 5ae0013aab0..085f21fe138 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -456,9 +456,10 @@ static Mesh *arrayModifier_doArray( if (amd->fit_type == MOD_ARR_FITCURVE && amd->curve_ob) { Curve *cu = amd->curve_ob->data; if (cu) { - if (amd->curve_ob->curve_cache && amd->curve_ob->curve_cache->path) { + CurveCache *curve_cache = amd->curve_ob->runtime.curve_cache; + if (curve_cache != NULL && curve_cache->path != NULL) { float scale_fac = mat4_to_scale(amd->curve_ob->obmat); - length = scale_fac * amd->curve_ob->curve_cache->path->totdist; + length = scale_fac * curve_cache->path->totdist; } } } |