[Bf-blender-cvs] [f22f84ea322] fluid-mantaflow: fix for particle float type define

[Sebastián Barschkis]

Commit: f22f84ea32206f4387bad37877e45d8564b10f01
Author: Sebastián Barschkis
Date:   Thu Jul 20 22:48:24 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBf22f84ea32206f4387bad37877e45d8564b10f01

fix for particle float type define

PFLOAT name collided with PFLOAT from windows header

===================================================================

M	source/blender/blenkernel/intern/particle_system.c
M	source/blender/makesdna/DNA_particle_types.h

===================================================================

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 0a0880fdf06..8d0d3b5cd4c 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3840,7 +3840,7 @@ static void particles_manta_step(ParticleSimulationData *sim, int UNUSED(cfra),
 				// check if type of particle type matches current particle system type (only important for snd particles)
 				if ((part->type == PART_MANTA_DROP) && (type != PDROPLET)) continue;
 				if ((part->type == PART_MANTA_BUBBLE) && (type != PBUBBLE)) continue;
-				if ((part->type == PART_MANTA_FLOAT) && (type != PFLOAT)) continue;
+				if ((part->type == PART_MANTA_FLOAT) && (type != PFLOATER)) continue;
 				if ((part->type == PART_MANTA_TRACER) && (type != PTRACER)) continue;
 
 				// Only allow active particles, i.e. filter out dead particles that just Mantaflow needs
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 59603bd35bb..4401225cdeb 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -365,7 +365,7 @@ typedef enum eParticleDrawFlag {
 /* mirroring manta secondary particle types */
 #define PDROPLET (1<<2)
 #define PBUBBLE  (1<<3)
-#define PFLOAT   (1<<4)
+#define PFLOATER (1<<4)
 #define PTRACER  (1<<5)
 
 /* part->flag */