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:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-12-05 22:53:09 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-12-05 22:53:09 +0400
commitf55f9e95db44838130a18f80b33bd77f58e8a987 (patch)
tree502ddd00634c4ec1a2098337f4ec1f524bfc4a73 /source/blender/blenkernel/intern/tracking.c
parent9e51f4b94368a612c5561f20f4b44f858ab5318e (diff)
parentc40d8921b8b61c0465a2fe9bca72dc418bf39c7d (diff)
Merging r42413 through r42441 form trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
-rw-r--r--source/blender/blenkernel/intern/tracking.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index 60d5c19bff7..0786abba67d 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -1167,7 +1167,7 @@ int BKE_tracking_next(MovieTrackingContext *context)
if(!ibuf_new)
return 0;
- #pragma omp parallel for private(a) shared(ibuf_new, ok) if(map_size>1)
+ #pragma omp parallel for private(a) shared(ibuf_new, ok) if(map_size>1)
for(a= 0; a<map_size; a++) {
TrackContext *track_context;
MovieTrackingTrack *track;