diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-11 16:50:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-11 16:50:05 +0400 |
| commit | 1c390fb60d9092bb6e5ea1c9ba7d84f53f16176a (patch) | |
| tree | a36e69fbe21d7f906edbbcad6286f589cfc78102 /source/blender/blenkernel/intern/tracking.c | |
| parent | cca55e5c582cad61580ac2a210789ddbaf0c264c (diff) | |
Tiles branch:
* Fix OpenCL not being found on Mac OS X.
* Fix merge error in tracking.c
* Node/RNA naming capitalization and underscore consistency.
* Add missing license headers in opencl files.
* Remove unneeded COM_defines.h.trunk file.
* Various code style consistency fixes.
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index e6032a50854..695ea1dc07a 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -975,8 +975,8 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u context->clip_flag= clip->flag&MCLIP_TIMECODE_FLAGS; context->user= *user; - context->user.render_size= 0; - context->user.render_flag= MCLIP_PROXY_RENDER_SIZE_FULL; + context->user.render_size= MCLIP_PROXY_RENDER_SIZE_FULL; + context->user.render_flag= 0; if(!sequence) BLI_begin_threaded_malloc(); |