[Bf-blender-cvs] [218c0129253] fluid-mantaflow: post merge compiling fixes

[Sebastián Barschkis]

Commit: 218c0129253b4ed9c264bdf862e6132cbcd212ca
Author: Sebastián Barschkis
Date:   Sat Feb 24 00:25:03 2018 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB218c0129253b4ed9c264bdf862e6132cbcd212ca

post merge compiling fixes

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

M	source/blender/blenkernel/intern/particle.c
M	source/blender/makesrna/intern/rna_smoke.c

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

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index d7e08233601..1d8ec41e2c5 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -740,7 +740,7 @@ void psys_render_restore(Object *ob, ParticleSystem *psys)
 
 	if (disp != render_disp) {
 		/* Hair can and has to be recalculated if everything isn't displayed. */
-		if (ELEM(psys->part->type, PART_HAIR, PART_FLUID)) {
+		if (ELEM(psys->part->type, PART_HAIR, PART_FLUID, PART_MANTA_FLIP, PART_MANTA_DROP, PART_MANTA_BUBBLE, PART_MANTA_FLOAT, PART_MANTA_TRACER)) {
 			psys->recalc |= PSYS_RECALC_RESET;
 		}
 		else {
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 297f9cc202c..d2d84fd3503 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -116,7 +116,7 @@ static void rna_Smoke_parts_create(PointerRNA *ptr, char *pset_name, char* parts
 	ParticleSettings *part;
 
 	/* add particle system */
-	part = psys_new_settings(pset_name, NULL);
+	part = BKE_particlesettings_add(NULL, pset_name);
 	psys = MEM_callocN(sizeof(ParticleSystem), "particle_system");
 
 	part->type = psys_type;