diff options
author | Joshua Leung <aligorith@gmail.com> | 2011-03-14 13:45:42 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2011-03-14 13:45:42 +0300 |
commit | 7609370d504de51371b96d8e6807ec6f62ee6c69 (patch) | |
tree | 70c34d8fd214dd963602ceff0f2f247704fd1295 /source/blender/blenkernel | |
parent | 2d1ef275f2299c71dade74743cdca0c771648333 (diff) |
Bugfixes:
- Sync Markers option works for local markers (or any other list of
markers in future) too now.
- Apply Pose to Restpose operator now displays a warning if an action
was found (warning about the action now being invalid)
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 48 |
2 files changed, 0 insertions, 51 deletions
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index aa057e22d20..a1a8b1b28cb 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -78,9 +78,6 @@ int scene_camera_switch_update(struct Scene *scene); char *scene_find_marker_name(struct Scene *scene, int frame); char *scene_find_last_marker_name(struct Scene *scene, int frame); -int scene_marker_tfm_translate(struct Scene *scene, int delta, unsigned int flag); -int scene_marker_tfm_extend(struct Scene *scene, int delta, int flag, int frame, char side); -int scene_marker_tfm_scale(struct Scene *scene, float value, int flag); struct Base *scene_add_base(struct Scene *sce, struct Object *ob); void scene_deselect_all(struct Scene *sce); diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 6151bd8a735..c4eefb16348 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -832,54 +832,6 @@ char *scene_find_last_marker_name(Scene *scene, int frame) return best_marker ? best_marker->name : NULL; } -/* markers need transforming from different parts of the code so have - * a generic function to do this */ -int scene_marker_tfm_translate(Scene *scene, int delta, unsigned int flag) -{ - TimeMarker *marker; - int tot= 0; - - for (marker= scene->markers.first; marker; marker= marker->next) { - if ((marker->flag & flag) == flag) { - marker->frame += delta; - tot++; - } - } - - return tot; -} - -int scene_marker_tfm_extend(Scene *scene, int delta, int flag, int frame, char side) -{ - TimeMarker *marker; - int tot= 0; - - for (marker= scene->markers.first; marker; marker= marker->next) { - if ((marker->flag & flag) == flag) { - if((side=='L' && marker->frame < frame) || (side=='R' && marker->frame >= frame)) { - marker->frame += delta; - tot++; - } - } - } - - return tot; -} - -int scene_marker_tfm_scale(struct Scene *scene, float value, int flag) -{ - TimeMarker *marker; - int tot= 0; - - for (marker= scene->markers.first; marker; marker= marker->next) { - if ((marker->flag & flag) == flag) { - marker->frame= CFRA + (int)floorf(((float)(marker->frame - CFRA) * value) + 0.5f); - tot++; - } - } - - return tot; -} Base *scene_add_base(Scene *sce, Object *ob) { |