[Bf-blender-cvs] [d4acb55] fluid-mantaflow: correct path parsing for smoke script
Sebastián Barschkis
noreply at git.blender.org
Fri Oct 7 00:50:15 CEST 2016
Commit: d4acb55f1d9fa9ef52d0f870cefd8deade0ec04a
Author: Sebastián Barschkis
Date: Fri Oct 7 00:49:12 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBd4acb55f1d9fa9ef52d0f870cefd8deade0ec04a
correct path parsing for smoke script
===================================================================
M intern/mantaflow/intern/strings/smoke_script.h
===================================================================
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 2a1ed56..e9223bb 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -344,67 +344,67 @@ def update_flame_high():\n\
const std::string smoke_import_low = "\n\
def load_smoke_data_low(path):\n\
- density.load(path + str('density.uni'))\n\
- flags.load(path + str('flags.uni'))\n\
- vel.load(path + str('vel.uni'))\n\
- forces.load(path + str('forces.uni'))\n\
- inflow_grid.load(path + str('inflow_low.uni'))\n\
- fuel_inflow.load(path + str('fuel_inflow.uni'))\n\
+ density.load(os.path.join(path, 'density.uni'))\n\
+ flags.load(os.path.join(path, 'flags.uni'))\n\
+ vel.load(os.path.join(path, 'vel.uni'))\n\
+ forces.load(os.path.join(path, 'forces.uni'))\n\
+ inflow_grid.load(os.path.join(path, 'inflow_low.uni'))\n\
+ fuel_inflow.load(os.path.join(path, 'fuel_inflow.uni'))\n\
if using_colors:\n\
- color_r.load(path + str('color_r.uni'))\n\
- color_g.load(path + str('color_g.uni'))\n\
- color_b.load(path + str('color_b.uni'))\n\
+ color_r.load(os.path.join(path, 'color_r.uni'))\n\
+ color_g.load(os.path.join(path, 'color_g.uni'))\n\
+ color_b.load(os.path.join(path, 'color_b.uni'))\n\
if using_heat:\n\
- heat.load(path + str('heat.uni'))\n\
+ heat.load(os.path.join(path, 'heat.uni'))\n\
if using_fire:\n\
- flame.load(path + str('flame.uni'))\n\
- fuel.load(path + str('fuel.uni'))\n\
- react.load(path + str('react.uni'))\n";
+ flame.load(os.path.join(path, 'flame.uni'))\n\
+ fuel.load(os.path.join(path, 'fuel.uni'))\n\
+ react.load(os.path.join(path, 'react.uni'))\n";
const std::string smoke_import_high = "\n\
def load_smoke_data_high(path):\n\
- xl_density.load(path + str('xl_density.uni'))\n\
- xl_flags.load(path + str('xl_flags.uni'))\n\
+ xl_density.load(os.path.join(path, 'xl_density.uni'))\n\
+ xl_flags.load(os.path.join(path, 'xl_flags.uni'))\n\
if using_colors:\n\
- xl_color_r.load(path + str('xl_color_r.uni'))\n\
- xl_color_g.load(path + str('xl_color_g.uni'))\n\
- xl_color_b.load(path + str('xl_color_b.uni'))\n\
+ xl_color_r.load(os.path.join(path, 'xl_color_r.uni'))\n\
+ xl_color_g.load(os.path.join(path, 'xl_color_g.uni'))\n\
+ xl_color_b.load(os.path.join(path, 'xl_color_b.uni'))\n\
if using_fire:\n\
- xl_flame.load(path + str('xl_flame.uni'))\n\
- xl_fuel.load(path + str('xl_fuel.uni'))\n\
- xl_react.load(path + str('xl_react.uni'))\n";
+ xl_flame.load(os.path.join(path, 'xl_flame.uni'))\n\
+ xl_fuel.load(os.path.join(path, 'xl_fuel.uni'))\n\
+ xl_react.load(os.path.join(path, 'xl_react.uni'))\n";
const std::string smoke_export_low = "\n\
def save_smoke_data_low(path):\n\
- density.save(path + str('density.uni'))\n\
- flags.save(path + str('flags.uni'))\n\
- vel.save(path + str('vel.uni'))\n\
- forces.save(path + str('forces.uni'))\n\
- inflow_grid.save(path + str('inflow_low.uni'))\n\
- fuel_inflow.save(path + str('fuel_inflow.uni'))\n\
+ density.save(os.path.join(path, 'density.uni'))\n\
+ flags.save(os.path.join(path, 'flags.uni'))\n\
+ vel.save(os.path.join(path, 'vel.uni'))\n\
+ forces.save(os.path.join(path, 'forces.uni'))\n\
+ inflow_grid.save(os.path.join(path, 'inflow_low.uni'))\n\
+ fuel_inflow.save(os.path.join(path, 'fuel_inflow.uni'))\n\
if using_colors:\n\
- color_r.save(path + str('color_r.uni'))\n\
- color_g.save(path + str('color_g.uni'))\n\
- color_b.save(path + str('color_b.uni'))\n\
+ color_r.save(os.path.join(path, 'color_r.uni'))\n\
+ color_g.save(os.path.join(path, 'color_g.uni'))\n\
+ color_b.save(os.path.join(path, 'color_b.uni'))\n\
if using_heat:\n\
- heat.save(path + str('heat.uni'))\n\
+ heat.save(os.path.join(path, 'heat.uni'))\n\
if using_fire:\n\
- flame.save(path + str('flame.uni'))\n\
- fuel.save(path + str('fuel.uni'))\n\
- react.save(path + str('react.uni'))\n";
+ flame.save(os.path.join(path, 'flame.uni'))\n\
+ fuel.save(os.path.join(path, 'fuel.uni'))\n\
+ react.save(os.path.join(path, 'react.uni'))\n";
const std::string smoke_export_high = "\n\
def save_smoke_data_low(path):\n\
- xl_density.save(path + str('xl_density.uni'))\n\
- xl_flags.save(path + str('xl_flags.uni'))\n\
+ xl_density.save(os.path.join(path, 'xl_density.uni'))\n\
+ xl_flags.save(os.path.join(path, 'xl_flags.uni'))\n\
if using_colors:\n\
- xl_color_r.save(path + str('xl_color_r.uni'))\n\
- xl_color_g.save(path + str('xl_color_g.uni'))\n\
- xl_color_b.save(path + str('xl_color_b.uni'))\n\
+ xl_color_r.save(os.path.join(path, 'xl_color_r.uni'))\n\
+ xl_color_g.save(os.path.join(path, 'xl_color_g.uni'))\n\
+ xl_color_b.save(os.path.join(path, 'xl_color_b.uni'))\n\
if using_fire:\n\
- xl_flame.save(path + str('xl_flame.uni'))\n\
- xl_fuel.save(path + str('xl_fuel.uni'))\n\
- xl_react.save(path + str('xl_react.uni'))\n";
+ xl_flame.save(os.path.join(path, 'xl_flame.uni'))\n\
+ xl_fuel.save(os.path.join(path, 'xl_fuel.uni'))\n\
+ xl_react.save(os.path.join(path, 'xl_react.uni'))\n";
//////////////////////////////////////////////////////////////////////
// DESTRUCTION
More information about the Bf-blender-cvs
mailing list