Commit: 2d1c14f0360a2a8172c7bdb64f6dbe99197f5c3e
Author: Campbell Barton
Date: Sat Feb 16 16:42:11 2019 +1100
Branches: master
https://developer.blender.org/rB2d1c14f0360a2a8172c7bdb64f6dbe99197f5c3e
Cleanup: rename SPACE_IPO -> SPACE_GRAPH
===================================================================
M source/blender/blenkernel/intern/context.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_draw.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/animation/anim_ops.c
M source/blender/editors/include/ED_anim_api.h
M source/blender/editors/interface/resources.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_graph/graph_ops.c
M source/blender/editors/space_graph/graph_utils.c
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_constraints.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_snap.c
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesrna/intern/rna_space.c
M source/blender/python/intern/bpy_rna_callback.c
M source/blender/windowmanager/intern/wm_keymap_utils.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/blenkernel/intern/context.c
b/source/blender/blenkernel/intern/context.c
index e59926b03f0..929fa95ffee 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -777,7 +777,7 @@ struct SpaceNode *CTX_wm_space_node(const bContext *C)
struct SpaceGraph *CTX_wm_space_graph(const bContext *C)
{
ScrArea *sa = CTX_wm_area(C);
- if (sa && sa->spacetype == SPACE_IPO)
+ if (sa && sa->spacetype == SPACE_GRAPH)
return sa->spacedata.first;
return NULL;
}
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 5a91dcf25a7..fcd745eeb1f 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6791,7 +6791,7 @@ static void direct_link_area(FileData *fd, ScrArea *area)
blo_do_versions_view3d_split_250(v3d, &sl->regionbase);
}
- else if (sl->spacetype == SPACE_IPO) {
+ else if (sl->spacetype == SPACE_GRAPH) {
SpaceGraph *sipo = (SpaceGraph *)sl;
sipo->ads = newdataadr(fd, sipo->ads);
@@ -6977,7 +6977,7 @@ static void lib_link_area(FileData *fd, ID *parent_id,
ScrArea *area)
}
break;
}
- case SPACE_IPO:
+ case SPACE_GRAPH:
{
SpaceGraph *sipo = (SpaceGraph *)sl;
bDopeSheet *ads = sipo->ads;
@@ -7464,7 +7464,7 @@ static void lib_link_workspace_layout_restore(struct
IDNameLib_Map *id_map, Main
}
}
}
- else if (sl->spacetype == SPACE_IPO) {
+ else if (sl->spacetype == SPACE_GRAPH) {
SpaceGraph *sipo = (SpaceGraph *)sl;
bDopeSheet *ads = sipo->ads;
diff --git a/source/blender/blenloader/intern/versioning_250.c
b/source/blender/blenloader/intern/versioning_250.c
index 15e3e7aa115..fcc446b0218 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -136,7 +136,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink
*sl, ListBase *lb)
if (sl) {
/* first channels for ipo action nla... */
switch (sl->spacetype) {
- case SPACE_IPO:
+ case SPACE_GRAPH:
ar = MEM_callocN(sizeof(ARegion), "area region
from do_versions");
BLI_addtail(lb, ar);
ar->regiontype = RGN_TYPE_CHANNELS;
@@ -277,7 +277,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink
*sl, ListBase *lb)
//ar->v2d.flag |= V2D_IS_INITIALISED;
break;
}
- case SPACE_IPO:
+ case SPACE_GRAPH:
{
SpaceGraph *sipo = (SpaceGraph *)sl;
memcpy(&ar->v2d, &sipo->v2d, sizeof(View2D));
diff --git a/source/blender/blenloader/intern/versioning_legacy.c
b/source/blender/blenloader/intern/versioning_legacy.c
index d8245cf9df3..86278e3f891 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -681,7 +681,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *bmain)
while (sa) {
SpaceLink *sl = sa->spacedata.first;
while (sl) {
- if (sl->spacetype == SPACE_IPO) {
+ if (sl->spacetype == SPACE_GRAPH) {
SpaceGraph *sipo = (SpaceGraph
*)sl;
sipo->v2d.max[0] = 15000.0;
}
@@ -873,7 +873,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *bmain)
SpaceLink *sl;
for (sl = sa->spacedata.first; sl; sl =
sl->next) {
- if (sl->spacetype == SPACE_IPO) {
+ if (sl->spacetype == SPACE_GRAPH) {
SpaceSeq *sseq = (SpaceSeq *)sl;
sseq->v2d.keeptot = 0;
}
@@ -2501,7 +2501,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *bmain)
sact->autosnap =
SACTSNAP_FRAME;
break;
}
- case SPACE_IPO:
+ case SPACE_GRAPH:
{
SpaceGraph *sipo =
(SpaceGraph *)sl;
sipo->autosnap =
SACTSNAP_FRAME;
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index 1a9e5aa4b85..85ff2973074 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2870,7 +2870,7 @@ static void write_area_regions(WriteData *wd, ScrArea
*area)
writestruct(wd, DATA, GPUDOFSettings, 1,
v3d->fx_settings.dof);
}
}
- else if (sl->spacetype == SPACE_IPO) {
+ else if (sl->spacetype == SPACE_GRAPH) {
SpaceGraph *sipo = (SpaceGraph *)sl;
ListBase tmpGhosts = sipo->runtime.ghost_curves;
diff --git a/source/blender/editors/animation/anim_channels_defines.c
b/source/blender/editors/animation/anim_channels_defines.c
index 48af3b82bd5..fb6a4696490 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -166,7 +166,7 @@ static bool acf_show_channel_colors(bAnimContext *ac)
break;
}
- case SPACE_IPO:
+ case SPACE_GRAPH:
{
SpaceGraph *sipo = (SpaceGraph *)ac->sl;
showGroupColors = !(sipo->flag &
SIPO_NODRAWGCOLORS);
@@ -533,7 +533,7 @@ static bool acf_scene_setting_valid(bAnimContext *ac,
bAnimListElem *UNUSED(ale)
/* visible only in Graph Editor */
case ACHANNEL_SETTING_VISIBLE:
- return ((ac) && (ac->spacetype == SPACE_IPO));
+ return ((ac) && (ac->spacetype == SPACE_GRAPH));
/* only select and expand supported otherwise */
case ACHANNEL_SETTING_SELECT:
@@ -693,7 +693,7 @@ static bool acf_object_setting_valid(bAnimContext *ac,
bAnimListElem *ale, eAnim
/* visible only in Graph Editor */
case ACHANNEL_SETTING_VISIBLE:
- return ((ac) && (ac->spacetype == SPACE_IPO) &&
(ob->adt));
+ return ((ac) && (ac->spacetype == SPACE_GRAPH) &&
(ob->adt));
/* only select and expand supported otherwise */
case ACHANNEL_SETTING_SELECT:
@@ -701,7 +701,7 @@ static bool acf_object_setting_valid(bAnimContext *ac,
bAnimListElem *ale, eAnim
return true;
case ACHANNEL_SETTING_ALWAYS_VISIBLE:
- return ((ac) && (ac->spacetype == SPACE_IPO) &&
(ob->adt));
+ return ((ac) && (ac->spacetype == SPACE_GRAPH) &&
(ob->adt));
default:
return false;
@@ -861,10 +861,10 @@ static bool acf_group_setting_valid(bAnimContext *ac,
bAnimListElem *UNUSED(ale)
/* conditionally supported */
case ACHANNEL_SETTING_VISIBLE: /* Only available in Graph
Editor */
- return (ac->spacetype == SPACE_IPO);
+ return (ac->spacetype == SPACE_GRAPH);
case ACHANNEL_SETTING_ALWAYS_VISIBLE:
- return (ac->spacetype == SPACE_IPO);
+ return (ac->spacetype == SPACE_GRAPH);
default: /* always supported */
return true;
@@ -887,7 +887,7 @@ static int acf_group_setting_flag(bAnimContext *ac,
eAnimChannel_Settings settin
* allowing different collapsing of groups there, since
sharing the flag
* proved to be a hazard for workflows...
*/
- return (ac->spacetype == SPACE_IPO) ?
+ return (ac->spacetype == SPACE_GRAPH) ?
AGRP_EXPANDED_G : /* Graph Editor case */
AGRP_EXPANDED; /* DopeSheet and
elsewhere */
}
@@ -993,7 +993,7 @@ static bool acf_fcurve_setting_valid(bAnimContext *ac,
bAnimListElem *ale, eAnim
return false; // NOTE: in this special case,
we need to draw ICON_ZOOMOUT
case ACHANNEL_SETTING_VISIBLE: /* Only available in Graph
Editor */
- return (ac->spacetype == SPACE_IPO);
+ return (ac->spacetype == SPACE_GRAPH);
case ACHANNEL_SETTING_ALWAYS_VISIBLE:
return false;
@@ -3856,7 +3856,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem
*ale, float yminc, float
* - in Grease Pencil mode, color swatches for layer color
*/
if (ac->sl) {
- if ((ac->spacetype == SPACE_IPO) &&
+ if ((ac->spacetype == SPACE_GRAPH) &&
(acf->has_setting(ac, ale, ACHANNEL_SETTING_VISIBLE) ||
acf->has_setting(ac, ale,
ACHANNEL_SETTING_ALWAYS_VISIBLE)))
{
@@ -3956,7 +3956,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem
*ale, float yminc, float
immUniformColor3fv(color);
/* check if we need to show the sliders */
- if ((ac->sl) && ELEM(ac->spacetype, SPACE_ACTION, SPACE_IPO)) {
+ if ((ac->sl) && ELEM(ac->spacetype, SPACE_ACTION, SPACE_GRAPH))
{
switch (ac->spacetype) {
case SPACE_ACTION:
{
@@ -3964,7 +3964,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem
*ale, float yminc, float
draw_sliders = (saction->flag &
SACTION_SLIDERS);
break;
}
- case SPACE_IPO:
+ case SPACE_GRAPH:
{
SpaceGraph *sipo = (SpaceGraph *)ac->sl;
draw_sliders = (sipo->flag &
SIPO_SLIDERS);
@@ -4466,7 +4466,7 @@ void ANIM_channel_draw_widgets(const bContext *C,
bAnimContext *ac, bAnimListEle
* - in Grease Pencil mode, color swatches for layer color
*/
if (ac->sl) {
- if ((ac->spacetype == SPACE_IPO) &&
+ if ((ac->spacetype == SPACE_GRAPH) &&
(acf->has_setting(ac, ale, ACHANNEL_SETTING_VISIBLE) ||
acf->has_setting(ac, ale,
ACHANNEL_SETTING_ALWAYS_VISIBLE)))
{
@@ -4563,7 +4563,7 @@ void ANIM_channel_draw_widgets(const bContext *C,
bAnimContext *ac, bAnimListEle
short draw_sliders = 0;
/* check if we need to show the sliders */
- if ((ac->sl) && ELEM(ac->spacetype, SPACE_ACTION, SPACE_IPO)) {
+ if ((ac->sl) && ELEM(ac->spacetype, SPACE_ACTION, SPACE_GRAPH))
{
switch (ac->spacetype) {
case SPACE_ACTION:
{
@@ -4571,7 +4571,7 @@ void ANIM_channel_draw_widgets(const bContext *C,
bAnimContext *ac, bAnimListEle
draw_sliders = (saction->flag &
SACTION_SLIDERS);
break;
}
- case SPACE_IPO:
+ case SPACE_GRAPH:
{
SpaceGraph *sipo = (SpaceGraph *)ac->sl;
draw_sliders = (sipo->flag &
SIPO_SLIDERS);
diff --git a/source/blender/editors/animation/anim_channels_edit.c
b/source/blender/editors/animation/anim_channels_edit.c
index 032bc778ff7..2fbb6c51216 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -663,7 +663,7 @@ static bool animedit_poll_channels_active(bContext *C)
if (ELEM(NULL, sa, CTX_wm_region(C)))
return 0;
/* animation editor test */
- if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_IPO, SPACE_NLA) == 0)
+ if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_GRAPH, SPACE_NLA) == 0)
return 0;
return 1;
@@ -680,7 +680,7 @@ static bool
animedit_poll_channels_nla_tweakmode_off(bContext *C)
if (
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
