Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-06-14 23:39:33 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-06-14 23:39:33 +0300
commit7439919ac0c4b0146cfed0ddbb8b945fe3675bcb (patch)
tree39730e1c17f939bd12e465ce597e2f24bbd91d34 /tests/gtests/blenlib/BLI_path_util_test.cc
parentdbca1afefa700f25198761624cdb9f1fd21095d2 (diff)
parenteeb9e5316a615f0e5052b28eee4966c4e2ed1152 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'tests/gtests/blenlib/BLI_path_util_test.cc')
-rw-r--r--tests/gtests/blenlib/BLI_path_util_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/gtests/blenlib/BLI_path_util_test.cc b/tests/gtests/blenlib/BLI_path_util_test.cc
index ef469da50b2..41fad661ea9 100644
--- a/tests/gtests/blenlib/BLI_path_util_test.cc
+++ b/tests/gtests/blenlib/BLI_path_util_test.cc
@@ -41,7 +41,7 @@ const char *GHOST_getSystemDir(int version, const char *versionstr)
struct ImBuf;
void IMB_freeImBuf(struct ImBuf *ibuf) {}
-struct ImBuf *IMB_dupImBuf(struct ImBuf *ibuf) {return NULL;}
+struct ImBuf *IMB_dupImBuf(const ImBuf *ibuf) {return NULL;}
#ifdef __linux__
char *zLhm65070058860608_br_find_exe(const char *default_exe)