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:
authorPeter Schlaile <peter@schlaile.de>2007-10-21 19:42:08 +0400
committerPeter Schlaile <peter@schlaile.de>2007-10-21 19:42:08 +0400
commita0390e5cc340febece6e2a7e61085033d79742e2 (patch)
tree5d0e89c54603641f394b95b0e76ee917d15a727d /source/blender/makesdna/DNA_scene_types.h
parentbacfc9eb91f10871a2ba9c3b35e48c3895dffac3 (diff)
== Core ==
This adds fractional FPS support to blender and should finally make NTSC work correctly. NTSC has an FPS of 30.0/1.001 which is approximately 29.97 FPS. Therefore, it is not enough to simply make frs_sec a float, since you can't represent this accurately enough. I added a seperate variable frs_sec_base and FPS is now frs_sec / frs_sec_base. I changed all the places, where frs_sec was used to my best knowledge. For convenience sake, I added several macros, that should make life easier in the future: FRA2TIME(a) : convert frame number to a double precision time in seconds TIME2FRA(a) : the same in the opposite direction FPS : return current FPS as a double precision number (last resort) This closes bug #6715 Standard framerates not supported / breaks sync -- 23.967 29.967 etc. https://projects.blender.org/tracker/?func=detail&aid=6715&group_id=9&atid=125 Please give this heavy testing with NTSC files, quicktime in/export and the python interface. Errors are most probably only spotted on longer timelines, so that is also important. The patch was tested by Troy Sobotka and me, so it most probably should work out of the box, but wider testing is important, since errors are very subtle. Enjoy!
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
-rw-r--r--source/blender/makesdna/DNA_scene_types.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 56b44c3ec97..8c6c9156142 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -241,16 +241,17 @@ typedef struct RenderData {
*/
short osa;
- short frs_sec, edgeint;
-
/* safety, border and display rect */
rctf safety, border;
rcti disprect;
/* information on different layers to be rendered */
ListBase layers;
- short actlay, pad;
- int pad2;
+ short actlay, pad2;
+
+ short edgeint;
+ short frs_sec;
+ float frs_sec_base;
/**
* Value used to define filter size for all filter options */