diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-10 04:44:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-10 04:44:24 +0300 |
commit | cecd4fe2548c57d3ef11010e039410b793b675dd (patch) | |
tree | b456c5b7328bb85334e7e55378d8c75580317a12 /source/blender/editors | |
parent | 168a6a4bfc13cbe5c2fb510607b9565de3eb9472 (diff) | |
parent | 9df2b6da3a718323dbe9431c5a4b43fc309fa4b9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_action/space_action.c | 21 | ||||
-rw-r--r-- | source/blender/editors/space_graph/graph_draw.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_graph/graph_edit.c | 10 | ||||
-rw-r--r-- | source/blender/editors/space_graph/space_graph.c | 19 |
4 files changed, 27 insertions, 27 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 diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c index 65bf8af70e8..d4f6824ccdf 100644 --- a/source/blender/editors/space_graph/graph_draw.c +++ b/source/blender/editors/space_graph/graph_draw.c @@ -981,8 +981,8 @@ void graph_draw_ghost_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar) immUniform1f("dash_width", 20.0f); immUniform1f("dash_factor", 0.5f); - /* the ghost curves are simply sampled F-Curves stored in sipo->ghostCurves */ - for (fcu = sipo->ghostCurves.first; fcu; fcu = fcu->next) { + /* the ghost curves are simply sampled F-Curves stored in sipo->runtime.ghost_curves */ + for (fcu = sipo->runtime.ghost_curves.first; fcu; fcu = fcu->next) { /* set whatever color the curve has set * - this is set by the function which creates these * - draw with a fixed opacity of 2 diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 08a5a6aeedd..e610aee4810 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -345,7 +345,7 @@ static void create_ghost_curves(bAnimContext *ac, int start, int end) int filter; /* free existing ghost curves */ - free_fcurves(&sipo->ghostCurves); + free_fcurves(&sipo->runtime.ghost_curves); /* sanity check */ if (start >= end) { @@ -396,7 +396,7 @@ static void create_ghost_curves(bAnimContext *ac, int start, int end) gcu->color[2] = fcu->color[2] - 0.07f; /* store new ghost curve */ - BLI_addtail(&sipo->ghostCurves, gcu); + BLI_addtail(&sipo->runtime.ghost_curves, gcu); /* restore driver */ fcu->driver = driver; @@ -463,11 +463,11 @@ static int graphkeys_clear_ghostcurves_exec(bContext *C, wmOperator *UNUSED(op)) sipo = (SpaceIpo *)ac.sl; /* if no ghost curves, don't do anything */ - if (BLI_listbase_is_empty(&sipo->ghostCurves)) + if (BLI_listbase_is_empty(&sipo->runtime.ghost_curves)) { return OPERATOR_CANCELLED; - + } /* free ghost curves */ - free_fcurves(&sipo->ghostCurves); + free_fcurves(&sipo->runtime.ghost_curves); /* update this editor only */ ED_area_tag_redraw(CTX_wm_area(C)); diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 1fa6cb9b3de..bfe52459a58 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -179,8 +179,9 @@ static void graph_free(SpaceLink *sl) MEM_freeN(si->ads); } - if (si->ghostCurves.first) - free_fcurves(&si->ghostCurves); + if (si->runtime.ghost_curves.first) { + free_fcurves(&si->runtime.ghost_curves); + } } @@ -208,7 +209,7 @@ static SpaceLink *graph_duplicate(SpaceLink *sl) SpaceIpo *sipon = MEM_dupallocN(sl); /* clear or remove stuff from old */ - BLI_duplicatelist(&sipon->ghostCurves, &((SpaceIpo *)sl)->ghostCurves); + BLI_duplicatelist(&sipon->runtime.ghost_curves, &((SpaceIpo *)sl)->runtime.ghost_curves); sipon->ads = MEM_dupallocN(sipon->ads); return (SpaceLink *)sipon; @@ -585,7 +586,7 @@ static void graph_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, switch (wmn->data) { case ND_OB_ACTIVE: /* selection changed, so force refresh to flush (needs flag set to do syncing) */ case ND_OB_SELECT: - sipo->flag |= SIPO_TEMP_NEEDCHANSYNC; + sipo->runtime.flag |= SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC; ED_area_tag_refresh(sa); break; @@ -598,7 +599,7 @@ static void graph_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, switch (wmn->data) { case ND_BONE_SELECT: /* selection changed, so force refresh to flush (needs flag set to do syncing) */ case ND_BONE_ACTIVE: - sipo->flag |= SIPO_TEMP_NEEDCHANSYNC; + sipo->runtime.flag |= SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC; ED_area_tag_refresh(sa); break; case ND_TRANSFORM: @@ -612,7 +613,7 @@ static void graph_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, case NC_NODE: if (wmn->action == NA_SELECTED) { /* selection changed, so force refresh to flush (needs flag set to do syncing) */ - sipo->flag |= SIPO_TEMP_NEEDCHANSYNC; + sipo->runtime.flag |= SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC; ED_area_tag_refresh(sa); } break; @@ -621,7 +622,7 @@ static void graph_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, ED_area_tag_redraw(sa); break; case NC_WINDOW: - if (sipo->flag & SIPO_TEMP_NEEDCHANSYNC) { + if (sipo->runtime.flag & SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC) { /* force redraw/refresh after undo/redo - prevents "black curve" problem */ ED_area_tag_refresh(sa); } @@ -778,9 +779,9 @@ static void graph_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 (sipo->flag & SIPO_TEMP_NEEDCHANSYNC) { + if (sipo->runtime.flag & SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC) { ANIM_sync_animchannels_to_data(C); - sipo->flag &= ~SIPO_TEMP_NEEDCHANSYNC; + sipo->runtime.flag &= ~SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC; ED_area_tag_redraw(sa); } |