Commit: ca73e57b2fe05198c1e95b5e87b39cd50b7cbae0 Author: Sebastián Barschkis Date: Sat Nov 12 02:33:15 2016 +0200 Branches: fluid-mantaflow https://developer.blender.org/rBca73e57b2fe05198c1e95b5e87b39cd50b7cbae0
removed obsolete high res grid access function =================================================================== M intern/mantaflow/intern/manta_fluid_API.cpp M source/blender/blenkernel/intern/smoke.c =================================================================== diff --git a/intern/mantaflow/intern/manta_fluid_API.cpp b/intern/mantaflow/intern/manta_fluid_API.cpp index 2d4f49d..d1f0732 100644 --- a/intern/mantaflow/intern/manta_fluid_API.cpp +++ b/intern/mantaflow/intern/manta_fluid_API.cpp @@ -388,11 +388,6 @@ extern "C" float *smoke_turbulence_get_flame(FLUID *smoke) return (smoke && smoke->usingHighRes()) ? smoke->getFlameHigh() : NULL; } -extern "C" float *liquid_turbulence_get_phi(FLUID *liquid) -{ - return (liquid && liquid->usingHighRes()) ? liquid->getPhiHigh() : NULL; -} - extern "C" void smoke_turbulence_get_res(FLUID *smoke, int *res) { if (smoke && smoke->usingHighRes()) { diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 7f386d6..0fa9eaa 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -861,11 +861,7 @@ static void obstacles_from_derivedmesh_task_cb(void *userdata, const int z) } } - /* tag obstacle cells */ -// data->obstacle_map[index] = 2; // TODO (sebbas): mantaflow convetion (FlagObstacle) - if (data->has_velocity) { -// data->obstacle_map[index] |= 8; // TODO (sebbas) data->num_obstacles[index]++; } } @@ -2297,7 +2293,7 @@ BLI_INLINE void apply_outflow_fields(int index, float inflow_value, float *densi if (obstacle && inflow_value < 0.f) { // only set outflow inside mesh // obstacle[index] = 20; // TODO (sebbas) mantaflow convention (FlagOutflow | FlagEmpty) } - + /* set smoke outflow */ if (density) { density[index] = 0.f; @@ -2633,8 +2629,6 @@ static void update_flowsfluids(Scene *scene, Object *ob, SmokeDomainSettings *sd float *bigcolor_r = smoke_turbulence_get_color_r(sds->fluid); float *bigcolor_g = smoke_turbulence_get_color_g(sds->fluid); float *bigcolor_b = smoke_turbulence_get_color_b(sds->fluid); - float *bigphi = liquid_turbulence_get_phi(sds->fluid); - int *bigobstacle = smoke_turbulence_get_obstacle(sds->fluid); #endif float *heat = smoke_get_heat(sds->fluid); float *velocity_x = smoke_get_velocity_x(sds->fluid); @@ -2771,7 +2765,7 @@ static void update_flowsfluids(Scene *scene, Object *ob, SmokeDomainSettings *sd if (sfs->behavior == MOD_SMOKE_FLOW_BEHAVIOR_OUTFLOW) { // outflow if (interpolated_value) { - apply_outflow_fields(index_big, inflow_map_high[index_big], bigdensity, NULL, bigfuel, bigreact, bigcolor_r, bigcolor_g, bigcolor_b, bigphi, NULL, bigobstacle); + apply_outflow_fields(index_big, inflow_map_high[index_big], bigdensity, NULL, bigfuel, bigreact, bigcolor_r, bigcolor_g, bigcolor_b, NULL, NULL, NULL); } } else if (sfs->behavior == MOD_SMOKE_FLOW_BEHAVIOR_GEOMETRY && smd2->time > 2) { _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs