Merged changes in the trunk up to revision 25613.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 29 Dec 2009 21:46:36 +0000 (21:46 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 29 Dec 2009 21:46:36 +0000 (21:46 +0000)
1  2 
release/scripts/ui/properties_render.py
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy_interface.c
source/blender/render/intern/source/pipeline.c
source/creator/creator.c

index d58e85030014b47e3898df45952f258f1e8402ca,f0cf338be06830109abf67ebb1ef4aac4ac6e523..9db9247287c1e6fcd1a61964999a926eddc60576
@@@ -2809,11 -2809,8 +2809,11 @@@ static int screen_render_exec(bContext 
        }
        RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break);
        
 +      /* inform Freestyle of the context */
 +      FRS_set_context(C);
 +
        if(RNA_boolean_get(op->ptr, "animation"))
-               RE_BlenderAnim(re, scene, scene->r.sfra, scene->r.efra, scene->r.frame_step);
+               RE_BlenderAnim(re, scene, scene->r.sfra, scene->r.efra, scene->r.frame_step, op->reports);
        else
                RE_BlenderFrame(re, scene, scene->r.cfra);
        
index f57b4069b3c478b71cd3a1eb727e05dd98d940f6,2528af6b57aa1047978d52bb8f488400ec398004..e5ab692165f2e3a7f4941b1bf93760f533d31b8f
@@@ -211,9 -211,7 +211,8 @@@ extern StructRNA RNA_FModifierGenerator
  extern StructRNA RNA_FModifierLimits;
  extern StructRNA RNA_FModifierNoise;
  extern StructRNA RNA_FModifierPython;
- extern StructRNA RNA_FModifierSound;
  extern StructRNA RNA_FollowPathConstraint;
 +extern StructRNA RNA_FreestyleModuleSettings;
  extern StructRNA RNA_Function;
  extern StructRNA RNA_GameBooleanProperty;
  extern StructRNA RNA_GameFloatProperty;
Simple merge