Merge branch 'master' into temp-ghash-experimentstemp-ghash-experiments

Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.

Conflicts:
	source/blender/blenlib/BLI_ghash.h
	source/blender/blenlib/intern/BLI_ghash.c
	source/blender/blenlib/intern/hash_mm2a.c
	source/blender/bmesh/tools/bmesh_region_match.c
	tests/gtests/blenlib/BLI_ghash_performance_test.cc
	tests/gtests/blenlib/BLI_ghash_test.cc
	tests/gtests/blenlib/CMakeLists.txt

1 files changed, 3 insertions, 13 deletions

diff --git a/source/blender/blenkernel/intern/tracking_auto.c b/source/blender/blenkernel/intern/tracking_auto.c
index 4cb3f2ca493..76261bddfbc 100644
--- a/source/blender/blenkernel/intern/tracking_auto.c
+++ b/source/blender/blenkernel/intern/tracking_auto.c
@@ -534,19 +534,9 @@ void BKE_autotrack_context_finish(AutoTrackContext *context)
 			if ((plane_track->flag & PLANE_TRACK_AUTOKEY) == 0) {
 				int track;
 				for (track = 0; track < context->num_tracks; ++track) {
-					MovieTrackingTrack *old_track;
-					bool do_update = false;
-					int j;
-
-					old_track = context->options[track].track;
-					for (j = 0; j < plane_track->point_tracksnr; j++) {
-						if (plane_track->point_tracks[j] == old_track) {
-							do_update = true;
-							break;
-						}
-					}
-
-					if (do_update) {
+					if (BKE_tracking_plane_track_has_point_track(plane_track,
+					                                             context->options[track].track))
+					{
 						BKE_tracking_track_plane_from_existing_motion(
 						        plane_track,
 						        context->first_frame);