diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-05 07:48:18 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-05 07:48:18 +0300 |
commit | 246aed88472bc332e3e346b7598f289c2371e6c7 (patch) | |
tree | 09579c4e298b72a0e37f024ddb20da1cf45d6a50 /source/blender | |
parent | 1e35f4da7268b76b12a2a23452d0a632a8d790a7 (diff) | |
parent | 1be265afc00057651ee03ccd5137d4a350641787 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 2 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_map.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index b28579febaf..10ca0fa6cbf 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1227,7 +1227,7 @@ void BLI_setenv_if_new(const char *env, const char *val) /** * get an env var, result has to be used immediately */ -const char* BLI_getenv(const char *env) +const char *BLI_getenv(const char *env) { #ifdef _MSC_VER static char buffer[32767]; /* 32767 is the total size of the environment block on windows*/ diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.cc b/source/blender/depsgraph/intern/builder/deg_builder_map.cc index cde7b9721b7..2d9719b3ad4 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_map.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_map.cc @@ -42,7 +42,6 @@ BuilderMap::BuilderMap() set = BLI_gset_ptr_new("deg builder gset"); } - BuilderMap::~BuilderMap() { BLI_gset_free(set, NULL); |