Merge branch 'master' into blender2.8

1 files changed, 10 insertions, 11 deletions

diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index 15587a5f39d..0a7db803acc 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -182,8 +182,7 @@ static void action_free(SpaceLink *UNUSED(sl))
 static void action_init(struct wmWindowManager *UNUSED(wm), ScrArea *sa)
 {
 	SpaceAction *saction = sa->spacedata.first;
-
-	saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
+	saction->runtime.flag |= SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC;
 }
 
 static SpaceLink *action_duplicate(SpaceLink *sl)
@@ -542,7 +541,7 @@ static void action_listener(
 					ED_area_tag_redraw(sa);
 				}
 				else if (wmn->action == NA_SELECTED) {
-					saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
+					saction->runtime.flag |= SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC;
 					ED_area_tag_refresh(sa);
 				}
 			}
@@ -550,7 +549,7 @@ static void action_listener(
 		case NC_ANIMATION:
 			/* for NLA tweakmode enter/exit, need complete refresh */
 			if (wmn->data == ND_NLA_ACTCHANGE) {
-				saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
+				saction->runtime.flag |= SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC;
 				ED_area_tag_refresh(sa);
 			}
 			/* autocolor only really needs to change when channels are added/removed, or previously hidden stuff appears
@@ -598,7 +597,7 @@ static void action_listener(
 				switch (wmn->data) {
 					case ND_OB_ACTIVE:  /* selection changed, so force refresh to flush (needs flag set to do syncing) */
 					case ND_OB_SELECT:
-						saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
+						saction->runtime.flag |= SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC;
 						ED_area_tag_refresh(sa);
 						break;
 
@@ -612,7 +611,7 @@ static void action_listener(
 			switch (wmn->data) {
 				case ND_BONE_SELECT:    /* selection changed, so force refresh to flush (needs flag set to do syncing) */
 				case ND_BONE_ACTIVE:
-					saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
+					saction->runtime.flag |= SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC;
 					ED_area_tag_refresh(sa);
 					break;
 				case ND_TRANSFORM:
@@ -648,7 +647,7 @@ static void action_listener(
 		case NC_NODE:
 			if (wmn->action == NA_SELECTED) {
 				/* selection changed, so force refresh to flush (needs flag set to do syncing) */
-				saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
+				saction->runtime.flag |= SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC;
 				ED_area_tag_refresh(sa);
 			}
 			break;
@@ -661,13 +660,13 @@ static void action_listener(
 					ED_area_tag_redraw(sa);
 					break;
 				case ND_SPACE_CHANGED:
-					saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
+					saction->runtime.flag |= SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC;
 					ED_area_tag_refresh(sa);
 					break;
 			}
 			break;
 		case NC_WINDOW:
-			if (saction->flag & SACTION_TEMP_NEEDCHANSYNC) {
+			if (saction->runtime.flag & SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC) {
 				/* force redraw/refresh after undo/redo - [#28962] */
 				ED_area_tag_refresh(sa);
 			}
@@ -797,14 +796,14 @@ static void action_refresh(const bContext *C, ScrArea *sa)
 	/* update the state of the animchannels in response to changes from the data they represent
 	 * NOTE: the temp flag is used to indicate when this needs to be done, and will be cleared once handled
 	 */
-	if (saction->flag & SACTION_TEMP_NEEDCHANSYNC) {
+	if (saction->runtime.flag & SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC) {
 		ARegion *ar;
 
 		/* Perform syncing of channel state incl. selection
 		 * Active action setting also occurs here (as part of anim channel filtering in anim_filter.c)
 		 */
 		ANIM_sync_animchannels_to_data(C);
-		saction->flag &= ~SACTION_TEMP_NEEDCHANSYNC;
+		saction->runtime.flag &= ~SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC;
 
 		/* Tag everything for redraw
 		 * - Regions (such as header) need to be manually tagged for redraw too