diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-05 07:34:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-05 07:34:31 +0300 |
commit | 1e35f4da7268b76b12a2a23452d0a632a8d790a7 (patch) | |
tree | b3ba68e17ade96f90986de14d1221026f564384d /source/blender/modifiers/intern | |
parent | af7d0af153a35796b6eb7cde3fc417025919495d (diff) | |
parent | c13b2a2504393371e32a4fb4c01cfad8d7cc929e (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index 44079163de5..68968953459 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -479,8 +479,8 @@ static Mesh *fluidsim_read_cache( const char *strEnvName2 = "BLENDER_ELBEEMBOBJABORT"; // from blendercall.cpp if (G.background == 1) { - if (getenv(strEnvName2)) { - int elevel = atoi(getenv(strEnvName2)); + if (BLI_getenv(strEnvName2)) { + int elevel = atoi(BLI_getenv(strEnvName2)); if (elevel > 0) { printf("Env. var %s set, fluid sim mesh '%s' not found, aborting render...\n", strEnvName2, targetFile); |