[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51693] trunk/blender/source/blender/ blenkernel/intern: Smoke/Dynamic Paint: Allow use of fluid sim generated particles as emitter/brush.

[Miika Hamalainen]

Revision: 51693
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51693
Author:   miikah
Date:     2012-10-27 17:19:55 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Smoke/Dynamic Paint: Allow use of fluid sim generated particles as emitter/brush.

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

Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c	2012-10-27 16:47:08 UTC (rev 51692)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c	2012-10-27 17:19:55 UTC (rev 51693)
@@ -4892,7 +4892,7 @@
 					/* Apply brush on the surface depending on it's collision type */
 					/* Particle brush: */
 					if (brush->collision == MOD_DPAINT_COL_PSYS) {
-						if (brush->psys && brush->psys->part && brush->psys->part->type == PART_EMITTER &&
+						if (brush->psys && brush->psys->part && ELEM(brush->psys->part->type, PART_EMITTER, PART_FLUID) &&
 						    psys_check_enabled(brushObj, brush->psys))
 						{
 

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-10-27 16:47:08 UTC (rev 51692)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-10-27 17:19:55 UTC (rev 51693)
@@ -951,7 +951,7 @@
 
 static void emit_from_particles(Object *flow_ob, SmokeDomainSettings *sds, SmokeFlowSettings *sfs, EmissionMap *em, Scene *scene, float time, float dt)
 {
-	if (sfs && sfs->psys && sfs->psys->part && sfs->psys->part->type == PART_EMITTER) // is particle system selected
+	if (sfs && sfs->psys && sfs->psys->part && ELEM(sfs->psys->part->type, PART_EMITTER, PART_FLUID)) // is particle system selected
 	{
 		ParticleSimulationData sim;
 		ParticleSystem *psys = sfs->psys;