Revision: 36192
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36192
Author: kjym3
Date: 2011-04-17 02:47:32 +0000 (Sun, 17 Apr 2011)
Log Message:
-----------
Fix for composite node parameter animation not working with Freestyle.
The problem was reported by ikeahloe together with a .blend file for
reproducing the issue. Thanks!
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
2011-04-16 23:58:49 UTC (rev 36191)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
2011-04-17 02:47:32 UTC (rev 36192)
@@ -46,6 +46,7 @@
char name[22];
snprintf(name, sizeof(name), "FRS%d_%s", render_count,
re->scene->id.name+2);
freestyle_scene = add_scene(name);
+ freestyle_scene->r.cfra = old_scene->r.cfra;
freestyle_scene->r.mode= old_scene->r.mode;
freestyle_scene->r.xsch= old_scene->r.xsch;
freestyle_scene->r.ysch= old_scene->r.ysch;
Modified:
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
2011-04-16 23:58:49 UTC (rev 36191)
+++ branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
2011-04-17 02:47:32 UTC (rev 36192)
@@ -3000,7 +3000,6 @@
void RE_RenderFreestyleStrokes(Render *re, Main *bmain, Scene *scene)
{
re->result_ok= 0;
- scene->r.cfra= 1;
if(render_initialize_from_main(re, bmain, scene, NULL, scene->lay, 0,
0)) {
do_render_fields_blur_3d(re);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
