Commit: 3d8c1068baf4e2e2d8b40d3dd030c04e0783d117
Author: Sergey Sharybin
Date: Mon Feb 3 19:39:49 2014 +0600
https://developer.blender.org/rB3d8c1068baf4e2e2d8b40d3dd030c04e0783d117
Fix T38420: Segfault when curve deform modifier and cyclic dependency
Crash was caused by missing curve_cache due to cyclic dependency.
This commit is rather a workaround, but we couldn't really guarantee
proper behavior in cases with cyclic dependency. So rather than calling
object update directly as it used to be let's don't perform curve
deform and be safe for threading instead.
===================================================================
M source/blender/blenkernel/intern/lattice.c
===================================================================
diff --git a/source/blender/blenkernel/intern/lattice.c
b/source/blender/blenkernel/intern/lattice.c
index 8b509c7..dfab5a0 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -623,8 +623,8 @@ static int calc_curve_deform(Object *par, float co[3],
const bool is_neg_axis = (axis > 2);
/* to be sure, mostly after file load */
- if (par->curve_cache->path == NULL) {
- return 0; // happens on append...
+ if (ELEM(NULL, par->curve_cache, par->curve_cache->path)) {
+ return 0; // happens on append and cyclic dependencies...
}
/* options */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
