forked from bartvdbraak/blender
code cleanup: marker transform was doing some redundant/misleading assignments & checks, remove unused cruft.
also remove some other redundant checks.
This commit is contained in:
parent
f1a5d1d3bb
commit
4ea7193ccf
@ -509,7 +509,7 @@ void ui_widget_color_init(struct ThemeUI *tui);
|
||||
void ui_draw_menu_item(struct uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, int state);
|
||||
void ui_draw_preview_item(struct uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, int state);
|
||||
|
||||
extern unsigned char checker_stipple_sml[];
|
||||
extern unsigned char checker_stipple_sml[32 * 32 / 8];
|
||||
/* used for transp checkers */
|
||||
#define UI_TRANSP_DARK 100
|
||||
#define UI_TRANSP_LIGHT 160
|
||||
|
@ -346,7 +346,6 @@ static int initFlyInfo(bContext *C, FlyInfo *fly, wmOperator *op, wmEvent *event
|
||||
/* check for flying ortho camera - which we cant support well
|
||||
* we _could_ also check for an ortho camera but this is easier */
|
||||
if ((fly->rv3d->persp == RV3D_CAMOB) &&
|
||||
(fly->v3d->camera != NULL) &&
|
||||
(fly->rv3d->is_persp == FALSE))
|
||||
{
|
||||
((Camera *)fly->v3d->camera->data)->type = CAM_PERSP;
|
||||
|
@ -5722,10 +5722,9 @@ static void markerToTransDataInit(TransData *td, TransData2D *td2d, TransDataTra
|
||||
unit_m3(td->smtx);
|
||||
}
|
||||
|
||||
static void trackToTransData(SpaceClip *sc, TransData *td, TransData2D *td2d,
|
||||
static void trackToTransData(const int framenr, TransData *td, TransData2D *td2d,
|
||||
TransDataTracking *tdt, MovieTrackingTrack *track, float aspx, float aspy)
|
||||
{
|
||||
int framenr = ED_space_clip_get_clip_frame_number(sc);
|
||||
MovieTrackingMarker *marker = BKE_tracking_marker_ensure(track, framenr);
|
||||
|
||||
tdt->flag = marker->flag;
|
||||
@ -5777,7 +5776,6 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
|
||||
MovieClip *clip = ED_space_clip_get_clip(sc);
|
||||
ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
|
||||
MovieTrackingTrack *track;
|
||||
MovieTrackingMarker *marker;
|
||||
TransDataTracking *tdt;
|
||||
int framenr = ED_space_clip_get_clip_frame_number(sc);
|
||||
float aspx, aspy;
|
||||
@ -5788,8 +5786,6 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
|
||||
track = tracksbase->first;
|
||||
while (track) {
|
||||
if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
|
||||
marker = BKE_tracking_marker_get(track, framenr);
|
||||
|
||||
t->total++; /* offset */
|
||||
|
||||
if (track->flag & SELECT)
|
||||
@ -5820,9 +5816,7 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
|
||||
track = tracksbase->first;
|
||||
while (track) {
|
||||
if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
|
||||
marker = BKE_tracking_marker_get(track, framenr);
|
||||
|
||||
trackToTransData(sc, td, td2d, tdt, track, aspx, aspy);
|
||||
trackToTransData(framenr, td, td2d, tdt, track, aspx, aspy);
|
||||
|
||||
/* offset */
|
||||
td++;
|
||||
@ -5845,12 +5839,6 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
|
||||
td += 2;
|
||||
td2d += 2;
|
||||
tdt += 2;
|
||||
|
||||
if (marker->flag & MARKER_DISABLED) {
|
||||
td += 3;
|
||||
td2d += 3;
|
||||
tdt += 3;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -242,7 +242,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em,
|
||||
|
||||
key = (ParamKey)efa;
|
||||
|
||||
tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
|
||||
// tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); // UNUSED
|
||||
|
||||
if (efa->len == 3 || efa->len == 4) {
|
||||
/* for quads let parametrize split, it can make better decisions
|
||||
|
Loading…
Reference in New Issue
Block a user