[Bf-blender-cvs] [a7db0defc86] fluid-mantaflow: updated some default values

[Sebastián Barschkis]

Commit: a7db0defc86aaf8c2966dabcfa7271ac30d8cafa
Author: Sebastián Barschkis
Date:   Tue Aug 14 13:39:03 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBa7db0defc86aaf8c2966dabcfa7271ac30d8cafa

updated some default values

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

M	source/blender/blenkernel/intern/particle_system.c
M	source/blender/blenkernel/intern/smoke.c
M	source/blender/makesrna/intern/rna_smoke.c

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

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 3aa18c138bc..e0535fd4916 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3883,6 +3883,7 @@ static void particles_manta_step(
 			part->totpart = tottypepart;
 			part->sta = part->end = 1.0f;
 			part->lifetime = sim->scene->r.efra + 1;
+			part->draw_col = PART_DRAW_COL_VEL;
 
 			/* allocate particles */
 			realloc_particles(sim, part->totpart);
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 815fcb7a0c6..163d5e1e9d2 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -474,7 +474,7 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 			smd->domain->adapt_threshold = 0.02f;
 
 			/* fluid domain options */
-			smd->domain->maxres = 32;
+			smd->domain->maxres = 64;
 			smd->domain->solver_res = 3;
 			smd->domain->border_collisions = 0; // open domain
 			smd->domain->flags = FLUID_DOMAIN_USE_DISSOLVE_LOG | FLUID_DOMAIN_USE_ADAPTIVE_TIME;
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index cb98f984b72..416f17b6a26 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -481,11 +481,6 @@ static void rna_Smoke_domaintype_set(struct PointerRNA *ptr, int value)
 	SmokeDomainSettings *settings = (SmokeDomainSettings *)ptr->data;
 	Object *ob = (Object *)ptr->id.data;
 
-	/* Select all borders */
-	int borders = FLUID_DOMAIN_BORDER_FRONT & FLUID_DOMAIN_BORDER_BACK &
-					FLUID_DOMAIN_BORDER_RIGHT & FLUID_DOMAIN_BORDER_LEFT &
-					FLUID_DOMAIN_BORDER_TOP & FLUID_DOMAIN_BORDER_BOTTOM;
-
 	if (value != settings->type) {
 		/* Set common values for liquid/smoke domain: cache type, border collision and viewport drawtype. */
 		if (value == FLUID_DOMAIN_TYPE_GAS)
@@ -494,7 +489,12 @@ static void rna_Smoke_domaintype_set(struct PointerRNA *ptr, int value)
 			rna_Smoke_cachetype_data_set(ptr, FLUID_DOMAIN_FILE_UNI);
 			rna_Smoke_cachetype_particle_set(ptr, FLUID_DOMAIN_FILE_UNI);
 			rna_Smoke_cachetype_noise_set(ptr, FLUID_DOMAIN_FILE_UNI);
-			rna_Smoke_collisionextents_set(ptr, borders, true);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_FRONT, 1);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_BACK, 1);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_RIGHT, 1);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_LEFT, 1);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_TOP, 1);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_BOTTOM, 1);
 			ob->dt = OB_WIRE;
 		}
 		else if (value == FLUID_DOMAIN_TYPE_LIQUID)
@@ -503,7 +503,12 @@ static void rna_Smoke_domaintype_set(struct PointerRNA *ptr, int value)
 			rna_Smoke_cachetype_data_set(ptr, FLUID_DOMAIN_FILE_UNI);
 			rna_Smoke_cachetype_particle_set(ptr, FLUID_DOMAIN_FILE_UNI);
 			rna_Smoke_cachetype_noise_set(ptr, FLUID_DOMAIN_FILE_UNI);
-			rna_Smoke_collisionextents_set(ptr, borders, false);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_FRONT, 0);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_BACK, 0);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_RIGHT, 0);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_LEFT, 0);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_TOP, 0);
+			rna_Smoke_collisionextents_set(ptr, FLUID_DOMAIN_BORDER_BOTTOM, 0);
 			ob->dt = OB_SOLID;
 		}