diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-27 15:44:40 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-27 15:44:40 +0300 |
| commit | 62fd4395ac594dd02a61982d2bf92839d9810f1b (patch) | |
| tree | 0d96caf8481265bbe6b376961d00f58dbc46845e /source/blender/blenkernel/intern/object.c | |
| parent | 322380999ed91179ebce511c7b14e470b48bf993 (diff) | |
| parent | b52af946cd92993dd6918797214d956070813878 (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index cef3dd4f826..ba62404e88f 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2116,7 +2116,7 @@ static void ob_parcurve(Scene *scene, Object *ob, Object *par, float mat[4][4]) unit_m4(mat); cu = par->data; - if (ELEM(NULL, par->curve_cache, par->curve_cache->path, par->curve_cache->path->data)) /* only happens on reload file, but violates depsgraph still... fix! */ + if (par->curve_cache == NULL) /* only happens on reload file, but violates depsgraph still... fix! */ BKE_displist_make_curveTypes(scene, par, 0); if (par->curve_cache->path == NULL) return; |