[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14394] trunk/blender/source/blender/ blenkernel/intern:

[Brecht Van Lommel]

Revision: 14394
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14394
Author:   blendix
Date:     2008-04-12 16:30:17 +0200 (Sat, 12 Apr 2008)

Log Message:
-----------

Fix for bug #6753: metaballs instanced by a particle system did not
refresh properly, also fixed a memory leak.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/depsgraph.c
    trunk/blender/source/blender/blenkernel/intern/scene.c

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2008-04-12 13:49:00 UTC (rev 14393)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2008-04-12 14:30:17 UTC (rev 14394)
@@ -610,6 +610,8 @@
 			if(part->draw_as == PART_DRAW_OB && part->dup_ob) {
 				node2 = dag_get_node(dag, part->dup_ob);
 				dag_add_relation(dag, node, node2, DAG_RL_OB_OB);
+				if(part->dup_ob->type == OB_MBALL)
+					dag_add_relation(dag, node, node2, DAG_RL_DATA_DATA);
 			}
 
 			if(part->draw_as == PART_DRAW_GR && part->dup_group) {

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2008-04-12 13:49:00 UTC (rev 14393)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2008-04-12 14:30:17 UTC (rev 14394)
@@ -426,6 +426,9 @@
 							duplilist= object_duplilist(G.scene, (*base)->object);
 							
 							dupob= duplilist->first;
+
+							if(!dupob)
+								free_object_duplilist(duplilist);
 						}
 					}
 				}