Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 19 Dec 2017 12:42:01 +0000 (13:42 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 19 Dec 2017 12:42:01 +0000 (13:42 +0100)
commit2bbfce631d77035098be78b19e0334b14177b83c
tree1834cbb09d318b33022e6011ad0f738aaff4f7d0
parentf62de28972ec4f6ceccfc363dc7b78bf248e391e
parentb6b9351371b0821c6a308e2f487ce3b394290f02
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_tracking.h
source/blender/blenkernel/intern/tracking.c
source/blender/editors/space_clip/clip_intern.h
source/blender/editors/space_clip/clip_utils.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/makesrna/intern/rna_tracking.c