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:
authorJoshua Leung <aligorith@gmail.com>2007-03-24 04:08:17 +0300
committerJoshua Leung <aligorith@gmail.com>2007-03-24 04:08:17 +0300
commitf6ecea59b97f9c95c0ffa9081a8da2b4b4c39f33 (patch)
treed130f717a8dc67fb0518356c5f7185acd7127c2d /source/blender/src/edittime.c
parentbc31d61c3b1817916a77d7b0244de3f1973388e9 (diff)
Patch #6408: Small bugfix in action editor when use ctrl+z
A check is now performed to see if any markers were deleted before adding an undo-push, so you don't need to CTRL+Z twice to un-delete keys in the Action Editor if you didn't have any markers selected.
Diffstat (limited to 'source/blender/src/edittime.c')
-rw-r--r--source/blender/src/edittime.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/src/edittime.c b/source/blender/src/edittime.c
index 8047946f8ca..2f1cd2f939e 100644
--- a/source/blender/src/edittime.c
+++ b/source/blender/src/edittime.c
@@ -107,15 +107,18 @@ void add_marker(int frame)
void remove_marker(void)
{
TimeMarker *marker, *nmarker;
+ short changed= 0;
for(marker= G.scene->markers.first; marker; marker= nmarker) {
nmarker= marker->next;
- if(marker->flag & SELECT){
+ if(marker->flag & SELECT) {
BLI_freelinkN(&(G.scene->markers), marker);
+ changed= 1;
}
}
- BIF_undo_push("Remove Marker");
+ if (changed)
+ BIF_undo_push("Remove Marker");
}
/* rename first selected TimeMarker */