diff options
Diffstat (limited to 'source/blender/editors/transform')
5 files changed, 23 insertions, 23 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 7e479217997..dc4b535d268 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -213,7 +213,7 @@ static bool transdata_check_local_center(TransInfo *t, short around) (t->flag & (T_OBJECT | T_POSE)) || /* implicit: (t->flag & T_EDIT) */ (ELEM(t->obedit_type, OB_MESH, OB_CURVE, OB_MBALL, OB_ARMATURE, OB_GPENCIL)) || - (t->spacetype == SPACE_IPO) || + (t->spacetype == SPACE_GRAPH) || (t->options & (CTX_MOVIECLIP | CTX_MASK | CTX_PAINT_CURVE))) ); } @@ -276,7 +276,7 @@ void setTransformViewAspect(TransInfo *t, float r_aspect[3]) ED_space_clip_get_aspect(sclip, &r_aspect[0], &r_aspect[1]); } } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { /* depemds on context of usage */ } } @@ -343,7 +343,7 @@ void convertViewVec(TransInfo *t, float r_vec[3], double dx, double dy) r_vec[0] *= t->aspect[0]; r_vec[1] *= t->aspect[1]; } - else if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA)) { + else if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_NLA)) { convertViewVec2D(t->view, r_vec, dx, dy); } else if (ELEM(t->spacetype, SPACE_NODE, SPACE_SEQ)) { @@ -425,7 +425,7 @@ void projectIntViewEx(TransInfo *t, const float vec[3], int adr[2], const eV3DPr adr[0] = out[0]; adr[1] = out[1]; } - else if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA)) { + else if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_NLA)) { int out[2] = {0, 0}; UI_view2d_view_to_region((View2D *)t->view, vec[0], vec[1], &out[0], &out[1]); @@ -599,7 +599,7 @@ static void viewRedrawForce(const bContext *C, TransInfo *t) //SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first; WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL); } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { //SpaceGraph *sipo = (SpaceGraph *)t->sa->spacedata.first; WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL); } @@ -683,7 +683,7 @@ static void viewRedrawPost(bContext *C, TransInfo *t) allqueue(REDRAWIMAGE, 0); allqueue(REDRAWVIEW3D, 0); } - else if (ELEM(t->spacetype, SPACE_ACTION, SPACE_NLA, SPACE_IPO)) { + else if (ELEM(t->spacetype, SPACE_ACTION, SPACE_NLA, SPACE_GRAPH)) { allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWACTION, 0); allqueue(REDRAWNLA, 0); @@ -2101,7 +2101,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op) if ((prop = RNA_struct_find_property(op->ptr, "proportional")) && !RNA_property_is_set(op->ptr, prop)) { - if (t->spacetype == SPACE_IPO) + if (t->spacetype == SPACE_GRAPH) ts->proportional_fcurve = proportional; else if (t->spacetype == SPACE_ACTION) ts->proportional_action = proportional; @@ -2316,7 +2316,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve SPACE_TYPE_ANY, RGN_TYPE_ANY, helpline_poll, drawHelpline, t); } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { t->draw_handle_view = ED_region_draw_cb_activate(t->ar->type, drawTransformView, t, REGION_DRAW_POST_VIEW); //t->draw_handle_pixel = ED_region_draw_cb_activate(t->ar->type, drawTransformPixel, t, REGION_DRAW_POST_PIXEL); t->draw_handle_cursor = WM_paint_cursor_activate( @@ -2522,7 +2522,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve /* same as TFM_TIME_EXTEND, but we need the mode info for later * so that duplicate-culling will work properly */ - if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA)) + if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_NLA)) initTranslation(t); else initTimeTranslate(t); @@ -2534,7 +2534,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve * (for Graph/NLA Editors only since they uses 'standard' transforms to get 2D movement) * depending on which editor this was called from */ - if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA)) + if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_NLA)) initTranslation(t); else initTimeTranslate(t); @@ -4696,7 +4696,7 @@ static void initSnapSpatial(TransInfo *t, float r_snap[3]) r_snap[1] = ED_node_grid_size(); r_snap[2] = ED_node_grid_size(); } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { r_snap[0] = 0.0f; r_snap[1] = 1.0; r_snap[2] = 0.1f; @@ -4740,7 +4740,7 @@ static void initTranslation(TransInfo *t) t->num.unit_type[2] = B_UNIT_LENGTH; } else { - /* SPACE_IPO, SPACE_ACTION, etc. could use some time units, when we have them... */ + /* SPACE_GRAPH, SPACE_ACTION, etc. could use some time units, when we have them... */ t->num.unit_type[0] = B_UNIT_NONE; t->num.unit_type[1] = B_UNIT_NONE; t->num.unit_type[2] = B_UNIT_NONE; @@ -8679,7 +8679,7 @@ static short getAnimEdit_SnapMode(TransInfo *t) if (saction) autosnap = saction->autosnap; } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { SpaceGraph *sipo = (SpaceGraph *)t->sa->spacedata.first; if (sipo) diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 239b18cba2b..04559c77359 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -804,7 +804,7 @@ void drawPropCircle(const struct bContext *C, TransInfo *t) else if (t->spacetype == SPACE_IMAGE) { GPU_matrix_scale_2f(1.0f / t->aspect[0], 1.0f / t->aspect[1]); } - else if (ELEM(t->spacetype, SPACE_IPO, SPACE_ACTION)) { + else if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_ACTION)) { /* only scale y */ rcti *mask = &t->ar->v2d.mask; rctf *datamask = &t->ar->v2d.cur; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 26b0a595693..7b7a39d80e8 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -6705,7 +6705,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t) /* clear flag that was set for time-slide drawing */ saction->flag &= ~SACTION_MOVING; } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { SpaceGraph *sipo = (SpaceGraph *)t->sa->spacedata.first; bAnimContext ac; const bool use_handle = (sipo->flag & SIPO_NOHANDLES) == 0; @@ -6962,7 +6962,7 @@ int special_transform_moving(TransInfo *t) if (t->spacetype == SPACE_SEQ) { return G_TRANSFORM_SEQ; } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { return G_TRANSFORM_FCURVES; } else if ((t->flag & T_EDIT) || (t->flag & T_POSE)) { @@ -8716,7 +8716,7 @@ void createTransData(bContext *C, TransInfo *t) createTransSeqData(C, t); countAndCleanTransDataContainer(t); } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { t->flag |= T_POINTS | T_2D_EDIT; t->obedit_type = -1; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 6e6bd4e13dd..f785ce8f221 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1117,7 +1117,7 @@ void recalcData(TransInfo *t) else if (t->spacetype == SPACE_SEQ) { recalcData_sequencer(t); } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { recalcData_graphedit(t); } else if (t->spacetype == SPACE_NODE) { @@ -1483,7 +1483,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve t->view = &ar->v2d; t->around = V3D_AROUND_CENTER_BOUNDS; } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { SpaceGraph *sipo = sa->spacedata.first; t->view = &ar->v2d; t->around = sipo->around; @@ -1575,7 +1575,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve /* use settings from scene only if modal */ if (t->flag & T_MODAL) { if ((t->options & CTX_NO_PET) == 0) { - if (t->spacetype == SPACE_IPO) { + if (t->spacetype == SPACE_GRAPH) { t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_fcurve); } else if (t->spacetype == SPACE_ACTION) { @@ -1716,7 +1716,7 @@ void postTrans(bContext *C, TransInfo *t) FOREACH_TRANS_DATA_CONTAINER (t, tc) { /* free data malloced per trans-data */ if (ELEM(t->obedit_type, OB_CURVE, OB_SURF) || - (t->spacetype == SPACE_IPO)) + (t->spacetype == SPACE_GRAPH)) { TransData *td = tc->data; for (int a = 0; a < tc->data_len; a++, td++) { @@ -2058,7 +2058,7 @@ static void calculateCenter_FromAround(TransInfo *t, int around, float r_center[ case V3D_AROUND_CURSOR: if (ELEM(t->spacetype, SPACE_IMAGE, SPACE_CLIP)) calculateCenterCursor2D(t, r_center); - else if (t->spacetype == SPACE_IPO) + else if (t->spacetype == SPACE_GRAPH) calculateCenterCursorGraph2D(t, r_center); else calculateCenterCursor(t, r_center); diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 79b2f1a89d6..bbe1bcca350 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1517,7 +1517,7 @@ static void applyGridIncrement(TransInfo *t, float *val, int max_index, const fl if (use_aspect) { /* custom aspect for fcurve */ - if (t->spacetype == SPACE_IPO) { + if (t->spacetype == SPACE_GRAPH) { View2D *v2d = &t->ar->v2d; View2DGrid *grid; SpaceGraph *sipo = t->sa->spacedata.first; |