Commit: 4ffcc6ff56b60d1cc69e12a80c9c2cacd604688f
Author: Sergey Sharybin
Date: Tue May 26 22:36:18 2015 +0500
Branches: master
https://developer.blender.org/rB4ffcc6ff56b60d1cc69e12a80c9c2cacd604688f
Fix T44497: Crash on deleting curve handle with hook modifier
It was possible race condition on empty curves -- it's possible that curve
object is fully updated and path is null in that cases, Proper way to deal
with this is to check curve_cache for non-NULL.
===================================================================
M source/blender/blenkernel/intern/object.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index e05fc91..668969a 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2077,7 +2077,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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
