[Bf-blender-cvs] [80793fc740c] master: Cleanup: Use more clear field name

[Sergey Sharybin]

Commit: 80793fc740cb8a15402527df091f426f0dd30b7b
Author: Sergey Sharybin
Date:   Mon Feb 22 15:54:56 2021 +0100
Branches: master
https://developer.blender.org/rB80793fc740cb8a15402527df091f426f0dd30b7b

Cleanup: Use more clear field name

Disambiguate which time the frames are measured in.

===================================================================

M	source/blender/blenkernel/intern/movieclip.c
M	source/blender/editors/interface/interface_handlers.c
M	source/blender/makesdna/DNA_movieclip_types.h

===================================================================

diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index 85b1362c11e..0265e1c8b2c 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -1728,7 +1728,7 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
   scopes->track = NULL;
   scopes->track_locked = true;
 
-  scopes->framenr = user->framenr;
+  scopes->scene_framenr = user->framenr;
   scopes->ok = true;
 
   if (clip == NULL) {
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 3a4eda29206..37ce269777c 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -7491,7 +7491,7 @@ static bool ui_numedit_but_TRACKPREVIEW(
 
   if (!scopes->track_locked) {
     const MovieClip *clip = CTX_data_edit_movieclip(C);
-    const int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, scopes->framenr);
+    const int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, scopes->scene_framenr);
     if (scopes->marker->framenr != clip_framenr) {
       scopes->marker = BKE_tracking_marker_ensure(scopes->track, clip_framenr);
     }
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h
index f8076ee3bfb..8e01a9e1f1f 100644
--- a/source/blender/makesdna/DNA_movieclip_types.h
+++ b/source/blender/makesdna/DNA_movieclip_types.h
@@ -150,8 +150,8 @@ typedef struct MovieClipScopes {
   short track_disabled;
   /** Active track is locked, no transformation should be allowed. */
   short track_locked;
-  /** Frame number scopes are created for. */
-  int framenr;
+  /** Frame number scopes are created for (measured in scene frames). */
+  int scene_framenr;
   /** Track scopes are created for. */
   struct MovieTrackingTrack *track;
   /** Marker scopes are created for. */