diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-28 19:57:37 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-28 19:57:37 +0300 |
commit | 11ff47a134cc28347ac060b30b66247ae5dc8f98 (patch) | |
tree | c9d0fe17446f96b3ccf52fb6b8df7189f3dbba75 /intern | |
parent | bef9f42ef0edd7fb57636bebeabe89b22bb410c3 (diff) | |
parent | 8a6aa159034a6e7ee44becb09d8d5d4add040cff (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
-rw-r--r-- | intern/numaapi/source/numaapi.c | 1 | ||||
-rw-r--r-- | intern/numaapi/source/numaapi_stub.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/intern/numaapi/source/numaapi.c b/intern/numaapi/source/numaapi.c index ddd9199eeff..11b14d03451 100644 --- a/intern/numaapi/source/numaapi.c +++ b/intern/numaapi/source/numaapi.c @@ -24,7 +24,6 @@ #include <assert.h> -// Get string representation of NUMAPIResult. const char* numaAPI_ResultAsString(NUMAAPI_Result result) { switch (result) { case NUMAAPI_SUCCESS: return "SUCCESS"; diff --git a/intern/numaapi/source/numaapi_stub.c b/intern/numaapi/source/numaapi_stub.c index 318fd72369d..b850e43e195 100644 --- a/intern/numaapi/source/numaapi_stub.c +++ b/intern/numaapi/source/numaapi_stub.c @@ -31,8 +31,8 @@ //////////////////////////////////////////////////////////////////////////////// // Initialization. -NUMAPIResult numaAPI_Initialize(void) { - return UMAAPI_NOT_AVAILABLE; +NUMAAPIResult numaAPI_Initialize(void) { + return NUMAAPI_NOT_AVAILABLE; } //////////////////////////////////////////////////////////////////////////////// |