Commit: ee7042173c985b781b0e6eadfa3b602e484236eb
Author: Martin Felke
Date: Wed Jan 10 22:00:45 2018 +0100
Branches: fracture_modifier
https://developer.blender.org/rBee7042173c985b781b0e6eadfa3b602e484236eb
fixed a crasher when moving an object in dynamic fracture and when attempting
to undo/redo FM removal
===================================================================
M source/blender/blenkernel/intern/pointcache.c
M source/blender/editors/object/object_modifier.c
===================================================================
diff --git a/source/blender/blenkernel/intern/pointcache.c
b/source/blender/blenkernel/intern/pointcache.c
index 8cedf8bec70..c34d1fe0cc0 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1304,8 +1304,8 @@ static int ptcache_rigidbody_write(int index, void
*rb_v, void **data, int cfra
float linvel[3] = {0.0f, 0.0f, 0.0f};
float angvel[3] = {0.0f, 0.0f, 0.0f};
- //if (!rbw->cache_index_map || !rbw->cache_offset_map)
- // return 1;
+ if (!rbw->cache_index_map || !rbw->cache_offset_map)
+ return 1;
rbo = rbw->cache_index_map[index];
diff --git a/source/blender/editors/object/object_modifier.c
b/source/blender/editors/object/object_modifier.c
index 54fd2b10e0a..a430dc44b4b 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -351,7 +351,7 @@ static bool object_modifier_remove(Main *bmain, Object *ob,
ModifierData *md,
modifier_free(md);
BKE_object_free_derived_caches(ob);
- if (do_rigidbody_cleanup)
+ if (do_rigidbody_cleanup && scene)
{
/* need to clean up modifier remainders inside the rigidbody
world
* AFTER the modifier is gone... but only from the operator ?*/
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
