diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 11:56:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 11:56:42 +0400 |
| commit | ad1d3dd30fa5f4c33279679e3824899fd18801b8 (patch) | |
| tree | cef4de1e42c5a8a2a1f68719452891c19a065ab7 /source/blender/modifiers | |
| parent | 77a7ec7c61965efa9e2e82894c821fe5c937b989 (diff) | |
| parent | 1bdf652b89871614c38bf2146cf94522c3347e06 (diff) | |
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_edgesplit.c | 1 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim_util.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 519117842f8..5cb2eefa86b 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -38,6 +38,7 @@ #include "BLI_math.h" #include "BLI_array.h" #include "BLI_smallhash.h" +#include "BLI_linklist.h" #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index a42e8475e8d..78f08fa1053 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -105,7 +105,7 @@ void fluidsim_init(FluidsimModifierData *fluidmd) /* elubie: changed this to default to the same dir as the render output to prevent saving to C:\ on Windows */ - BLI_strncpy(fss->surfdataPath, btempdir, FILE_MAX); + BLI_strncpy(fss->surfdataPath, BLI_temporary_dir(), FILE_MAX); // first init of bounding box // no bounding box needed |