Commit: 44ea1f75a0f2ebb8d9c402c3e905da33a6b1244f
Author: Martin Felke
Date: Mon Dec 3 22:10:30 2018 +0100
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rB44ea1f75a0f2ebb8d9c402c3e905da33a6b1244f
forgot to free duplilist after usage, and re-added previously removed depsgraph
relation
relation is necessary to smoothly looking continued motion after dynamic
fracture
===================================================================
M source/blender/blenkernel/intern/fracture.c
M source/blender/blenkernel/intern/fracture_prefractured.c
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/fracture.c
b/source/blender/blenkernel/intern/fracture.c
index ab76b03a687..5d3792ab11d 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -3516,6 +3516,9 @@ void BKE_fracture_duplis_to_shards(FractureModifierData
*fmd, Object *ob, Scene
}
}
+ free_object_duplilist(lb);
+ lb = NULL;
+
#if 0
/*decouple from listbase because it will continue growing ... */
for (i = 0; i < j; i++)
diff --git a/source/blender/blenkernel/intern/fracture_prefractured.c
b/source/blender/blenkernel/intern/fracture_prefractured.c
index 5fde2845dd8..b828e171cbc 100644
--- a/source/blender/blenkernel/intern/fracture_prefractured.c
+++ b/source/blender/blenkernel/intern/fracture_prefractured.c
@@ -192,7 +192,7 @@ Mesh* BKE_fracture_apply(FractureModifierData *fmd, Object
*ob, Mesh *me_orig, D
if (fmd->shared->flag & MOD_FRACTURE_REFRESH)
{
- if (dupli)
+ if (fmd->flag & MOD_FRACTURE_USE_DUPLI)
{
BKE_fracture_meshislands_free(fmd, scene);
if (fmd->shared->dupli_shard_map) {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 32593d401f9..22cb86de250 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1654,7 +1654,6 @@ void DepsgraphRelationBuilder::build_rigidbody(Scene
*scene)
/* Needed to get correct base values. */
add_relation(trans_op, sim_key, "Base Ob
Transform -> Rigidbody Sim Eval");
}
-#if 0
else
{
OperationKey uber_geom_key(&object->id,
@@ -1662,7 +1661,6 @@ void DepsgraphRelationBuilder::build_rigidbody(Scene
*scene)
DEG_OPCODE_GEOMETRY_UBEREVAL);
add_relation(rbo_key, uber_geom_key, "RBO Sync
-> Uber Geom (Fracture)");
}
-#endif
}
FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
