[Bf-blender-cvs] [6101bda] terrible_consequencer: Support endpoint snapping correctly.

[Antony Riakiotakis]

Commit: 6101bdaf702512f15cb2f3dc47c923e117073199
Author: Antony Riakiotakis
Date:   Tue Nov 11 18:13:00 2014 +0100
Branches: terrible_consequencer
https://developer.blender.org/rB6101bdaf702512f15cb2f3dc47c923e117073199

Support endpoint snapping correctly.

===================================================================

M       source/blender/editors/transform/transform_conversions.c
M       source/blender/editors/transform/transform_snap.c

===================================================================

diff --git a/source/blender/editors/transform/transform_conversions.c 
b/source/blender/editors/transform/transform_conversions.c
index f14b304..d6ff05d 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -4505,18 +4505,22 @@ static int SeqToTransData_Recursive(TransInfo *t, 
ListBase *seqbase, TransData *
                                if (flag & SEQ_LEFTSEL) {
                                        SeqToTransData(td++, td2d++, tdsq++, 
seq, flag, SEQ_LEFTSEL);
                                        tot++;
+                                       min = min_ii(seq->startdisp, min);
+                                       max = max_ii(seq->startdisp, max);
                                }
                                if (flag & SEQ_RIGHTSEL) {
                                        SeqToTransData(td++, td2d++, tdsq++, 
seq, flag, SEQ_RIGHTSEL);
                                        tot++;
+                                       min = min_ii(seq->enddisp, min);
+                                       max = max_ii(seq->enddisp, max);
                                }
                        }
                        else {
                                SeqToTransData(td++, td2d++, tdsq++, seq, flag, 
SELECT);
                                tot++;
+                               min = min_ii(seq->startdisp, min);
+                               max = max_ii(seq->enddisp, max);
                        }
-                       min = min_ii(seq->startdisp, min);
-                       max = max_ii(seq->enddisp, max);
                }
        }
 
diff --git a/source/blender/editors/transform/transform_snap.c 
b/source/blender/editors/transform/transform_snap.c
index f65345e..f3e188b 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -2442,11 +2442,11 @@ int snapSequenceBounds(TransInfo *t, const int mval[2])
        startdist = abs(mframe - frame_left);
        /* check which is nearest */
        if (enddist > startdist) {
-               frame = frame_left - (ts->max - ts->min);;
+               frame = frame_left - (ts->max - ts->min);
        }
        else if (enddist == startdist) {
                if (mframe < frame_left) {
-                       frame = frame_left - (ts->max - ts->min);;
+                       frame = frame_left - (ts->max - ts->min);
                }
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs