merged changes to revision 24446
authorMaxime Curioni <maxime.curioni@gmail.com>
Tue, 10 Nov 2009 12:08:02 +0000 (12:08 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Tue, 10 Nov 2009 12:08:02 +0000 (12:08 +0000)
15 files changed:
1  2 
release/scripts/ui/properties_render.py
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.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/CMakeLists.txt
source/blender/render/SConscript
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/creator.c

index f096db38f359c60fc3eb3188299958da64a60141,5cc2039393a78983d887930c5b0afff977958328..b7a8102c5e36dd4c5eeb8548f3e1737b398fcfd9
@@@ -2671,11 -2677,8 +2677,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->frame_step);
+               RE_BlenderAnim(re, scene, scene->r.sfra, scene->r.efra, scene->r.frame_step);
        else
                RE_BlenderFrame(re, scene, scene->r.cfra);
        
Simple merge
index 74ae5b8268b4ab92e88da5ad0b1fcb126b2eac04,4a55c2fb6fba060c26cea2fff2d3fd638272679f..bf616ba2a035d13e9642059d0e83ba105f5977ec
@@@ -210,7 -217,12 +219,13 @@@ static void bpy_init_modules( void 
        Geometry_Init();
        Mathutils_Init();
        BGL_Init();
 +      Freestyle_Init();
+       /* add our own modules dir */
+       {
+               bpy_import_test("bpy_ops"); /* adds its self to bpy.ops */
+               bpy_import_test("bpy_utils"); /* adds its self to bpy.sys */
+       }
  }
  
  void BPY_update_modules( void )
Simple merge
Simple merge
Simple merge
Simple merge