diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-19 20:54:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-19 20:54:17 +0300 |
| commit | fa59c6a3e7d72d57faadcf0795848b4c3b8381d9 (patch) | |
| tree | ea668f42028f8cdf5a5968feeed27e8bd99b30fd /intern/cycles/blender/blender_util.h | |
| parent | e7f535cd4cf919b7e479d20b8a1b6714f166151d (diff) | |
| parent | 83de13f75aafca7d4e1d58ddd36cca19121aa84f (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/blender/blender_util.h')
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index b9a1de08705..ec836bd5ec1 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -32,7 +32,6 @@ * todo: clean this up ... */ extern "C" { -size_t BLI_timecode_string_from_time_simple(char *str, size_t maxlen, double time_seconds); void BKE_image_user_frame_calc(void *iuser, int cfra); void BKE_image_user_file_path(void *iuser, void *ima, char *path); unsigned char *BKE_image_get_pixels_for_frame(void *image, int frame); |