Commit: 0dd35a7e85d3862db8e829db660910022d18a636
Author: Sebastián Barschkis
Date: Fri Aug 3 11:01:22 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB0dd35a7e85d3862db8e829db660910022d18a636
minor cleanups
===================================================================
M intern/mantaflow/intern/FLUID.cpp
M source/blender/blenkernel/intern/smoke.c
===================================================================
diff --git a/intern/mantaflow/intern/FLUID.cpp
b/intern/mantaflow/intern/FLUID.cpp
index 88fd75abea3..6498d97ead0 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -960,7 +960,7 @@ static std::string getCacheFileEnding(char cache_format)
default:
if (FLUID::with_debug)
std::cout << "Error: Could not find file
extension" << std::endl;
- return "";
+ return ".uni";
}
}
diff --git a/source/blender/blenkernel/intern/smoke.c
b/source/blender/blenkernel/intern/smoke.c
index f844c997a6f..53bab71f3f1 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2632,7 +2632,6 @@ static void update_flowsfluids(
}
}
}
- if (flowobjs) MEM_freeN(flowobjs);
/* Adjust domain size if needed */
if (sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
