diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-30 09:26:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-30 09:26:29 +0300 |
| commit | dd38a712778e633c48fa71d2d72c8ae69b67af55 (patch) | |
| tree | 47753d29e43e80ebc78b28ea93d408ed922f14e7 /source/blender/blenkernel/BKE_scene.h | |
| parent | f8f4feefb8083e7f5875ae81b678a4c7c3c81660 (diff) | |
| parent | f4379f8b914eaf7aa1f17323f927836a3d9288fc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_scene.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index adccfda8e25..e2032e10833 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -130,6 +130,8 @@ int BKE_scene_camera_switch_update(struct Scene *scene); char *BKE_scene_find_marker_name(struct Scene *scene, int frame); char *BKE_scene_find_last_marker_name(struct Scene *scene, int frame); +int BKE_scene_frame_snap_by_seconds(struct Scene *scene, double interval_in_seconds, int cfra); + /* checks for cycle, returns 1 if it's all OK */ bool BKE_scene_validate_setscene(struct Main *bmain, struct Scene *sce); |