[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34948] trunk/blender/source/blender/ blenkernel/intern/particle.c: Particle fluid settings weren' t copied when particle settings were copied.

[Janne Karhu]

Revision: 34948
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34948
Author:   jhk
Date:     2011-02-18 00:21:19 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
Particle fluid settings weren't copied when particle settings were copied.
* Also removed some unnecessary null checks.

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

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2011-02-18 00:17:46 UTC (rev 34947)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2011-02-18 00:21:19 UTC (rev 34948)
@@ -3571,9 +3571,10 @@
 	int a;
 
 	partn= copy_libblock(part);
-	if(partn->pd) partn->pd= MEM_dupallocN(part->pd);
-	if(partn->pd2) partn->pd2= MEM_dupallocN(part->pd2);
-	partn->effector_weights = MEM_dupallocN(part->effector_weights);
+	partn->pd= MEM_dupallocN(part->pd);
+	partn->pd2= MEM_dupallocN(part->pd2);
+	partn->effector_weights= MEM_dupallocN(part->effector_weights);
+	partn->fluid= MEM_dupallocN(part->fluid);
 
 	partn->boids = boid_copy_settings(part->boids);