[Bf-blender-cvs] [1c8b45a] fluid-mantaflow: small script cleanup, removed uvs variable
SebastiaÌn Barschkis
noreply at git.blender.org
Sun Mar 6 23:50:53 CET 2016
Commit: 1c8b45a596e61546719629d78c067e83021ad5a1
Author: Sebastián Barschkis
Date: Thu Mar 3 22:48:30 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB1c8b45a596e61546719629d78c067e83021ad5a1
small script cleanup, removed uvs variable
===================================================================
M intern/smoke/intern/scenarios/smoke.h
M source/blender/makesdna/DNA_smoke_types.h
===================================================================
diff --git a/intern/smoke/intern/scenarios/smoke.h b/intern/smoke/intern/scenarios/smoke.h
index 238ad60..29fc6d8 100644
--- a/intern/smoke/intern/scenarios/smoke.h
+++ b/intern/smoke/intern/scenarios/smoke.h
@@ -38,8 +38,6 @@ gs = vec3($RESX$,$RESY$,$RESZ$)\n\
if dim == 2:\n\
gs.z = 1\n\
s = FluidSolver(name='main', gridSize=gs, dim=dim)\n\
-# old timestep -> not used when adaptTimestep is used\n\
-#s.timestep = $TIMESTEP$\n\
dt_default = 0.1\n\
dt_factor = $DT_FACTOR$\n\
fps = $FPS$\n\
@@ -361,7 +359,7 @@ def step_low():\n\
\n\
if using_heat:\n\
mantaMsg('Adding heat buoyancy')\n\
- gravity=vec3(0,0,-0.3125) if dim==3 else vec3(0,-0.0981,0)\n\
+ gravity=vec3(0,0,-1) if dim==3 else vec3(0,-0.0981,0)\n\
addBuoyancy2(flags=flags, grid=density, vel=vel, gravity=gravity, coefficient=$ALPHA$)\n\
addBuoyancy2(flags=flags, grid=heat, vel=vel, gravity=gravity, coefficient=$BETA$)\n\
else:\n\
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 5ec3b0d..2edc6ce 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -163,7 +163,6 @@ typedef struct SmokeDomainSettings {
float flame_smoke_color[3];
/* mantaflow settings */
int manta_solver_res; /*dimension of manta solver, 2d or 3d*/
- int manta_uvs_num; /*number of UVs, important for octaves count*/
/*noise settings*/
float noise_pos_scale;
float noise_time_anim;
More information about the Bf-blender-cvs
mailing list