Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 04:48:18 +0000 (14:48 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 04:48:18 +0000 (14:48 +1000)
source/blender/blenlib/intern/path_util.c
source/blender/depsgraph/intern/builder/deg_builder_map.cc

index b28579febaf71168fece03f62ab473cc1eb3bd09..10ca0fa6cbf95e13cbd79c75874919e8f6326b24 100644 (file)
@@ -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 charBLI_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*/
index cde7b9721b7735b580f2aa4db72fbcce25c993a7..2d9719b3ad4942921ba80f9901525eacd0128c3b 100644 (file)
@@ -42,7 +42,6 @@ BuilderMap::BuilderMap()
        set = BLI_gset_ptr_new("deg builder gset");
 }
 
-
 BuilderMap::~BuilderMap()
 {
        BLI_gset_free(set, NULL);