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:
authorCampbell Barton <ideasman42@gmail.com>2015-12-21 05:00:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-12-21 05:02:38 +0300
commit32be51dc66ae0e791970c8b7326afa16d60aa267 (patch)
treebc3c59d9b70f453e06917a3f47e6a6b9791df96f /source/blender/editors/space_clip
parent6f224941408eda8930489fa440af9539a92badad (diff)
Cleanup: warnings (msvc)
Part of patch D1670 by @LazyDodo
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/clip_editor.c2
-rw-r--r--source/blender/editors/space_clip/clip_ops.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index dbedfaa1de4..1ff656243d6 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -779,7 +779,7 @@ static unsigned char *prefetch_thread_next_frame(
return mem;
}
-static void prefetch_task_func(TaskPool *pool, void *task_data, int UNUSED(threadid))
+static void prefetch_task_func(TaskPool * __restrict pool, void *task_data, int UNUSED(threadid))
{
PrefetchQueue *queue = (PrefetchQueue *)BLI_task_pool_userdata(pool);
MovieClip *clip = (MovieClip *)task_data;
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index 7a66599655f..980657fc1cb 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -1180,7 +1180,7 @@ static unsigned char *proxy_thread_next_frame(ProxyQueue *queue, MovieClip *clip
return mem;
}
-static void proxy_task_func(TaskPool *pool, void *task_data, int UNUSED(threadid))
+static void proxy_task_func(TaskPool * __restrict pool, void *task_data, int UNUSED(threadid))
{
ProxyThread *data = (ProxyThread *)task_data;
ProxyQueue *queue = (ProxyQueue *)BLI_task_pool_userdata(pool);