Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Hnidek <jiri.hnidek@tul.cz>2005-05-12 01:50:19 +0400
committerJiri Hnidek <jiri.hnidek@tul.cz>2005-05-12 01:50:19 +0400
commit516e21459c2735ef778f31ebd853f70893d33b2c (patch)
treec0af485a9c97534c5bf27b53ff08fe03ff576d72 /source/blender/src/edittime.c
parent884c94500bce8545aa988a85136e49948b245d05 (diff)
- it was imposible to select one of two markers laying at the same frame ... this
problem is solved now. Drawing of markers is little bit hackish, because it is neccessary to draw unselected markers at the first time (unselected marker can't hide selected marker ... visual information about selection would be lost)
Diffstat (limited to 'source/blender/src/edittime.c')
-rw-r--r--source/blender/src/edittime.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/edittime.c b/source/blender/src/edittime.c
index 359a4bbe895..b1f0d9af00a 100644
--- a/source/blender/src/edittime.c
+++ b/source/blender/src/edittime.c
@@ -148,16 +148,18 @@ static int find_nearest_marker(float dx)
static void select_timeline_marker_frame(int frame, unsigned char shift)
{
TimeMarker *marker;
+ int select=0;
for(marker= G.scene->markers.first; marker; marker= marker->next) {
/* if Shift is not set, then deselect Markers */
if(!shift) marker->flag &= ~SELECT;
/* this way a not-shift select will allways give 1 selected marker */
- if(marker->frame == frame) {
+ if((marker->frame == frame) && (!select)) {
if(marker->flag & SELECT)
marker->flag &= ~SELECT;
else
marker->flag |= SELECT;
+ select = 1;
}
}
}