Merged changes in the trunk up to revision 36408.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 1 May 2011 13:50:38 +0000 (13:50 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 1 May 2011 13:50:38 +0000 (13:50 +0000)
20 files changed:
1  2 
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt
source/creator/creator.c

index 38d7b52399fc7d760e959dc7e2d8c7c402f08ac8,145d86575d0dc4ad20dfae4fdd9261e7b6041a0f..382c230ceac6e632e38f4451935f993dfa52b225
@@@ -216,9 -217,8 +217,9 @@@ void RE_init_threadcount(Render *re)
  void RE_TileProcessor(struct Render *re);
  
  /* only RE_NewRender() needed, main Blender render calls */
- void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, struct SceneRenderLayer *srl, unsigned int lay, int frame, const short write_still);
- void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene *scene, unsigned int lay, int sfra, int efra, int tfra, struct ReportList *reports);
+ void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, struct SceneRenderLayer *srl, struct Object *camera_override, unsigned int lay, int frame, const short write_still);
+ void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene *scene, struct Object *camera_override, unsigned int lay, int sfra, int efra, int tfra, struct ReportList *reports);
 +void RE_RenderFreestyleStrokes(struct Render *re, struct Main *bmain, struct Scene *scene);
  
  /* main preview render call */
  void RE_PreviewRender(struct Render *re, struct Main *bmain, struct Scene *scene);
index 468ce8846a830ef406dded7dc5493b7068e3b9ac,436f0ecd9974f242de77b2f9cab983d74c655c4d..2e869906d2c455a9ba4c059700a23670eb953452
@@@ -2980,10 -2910,10 +2984,10 @@@ void RE_BlenderFrame(Render *re, Main *
        
        scene->r.cfra= frame;
        
-       if(render_initialize_from_main(re, bmain, scene, srl, lay, 0, 0)) {
+       if(render_initialize_from_main(re, bmain, scene, srl, camera_override, lay, 0, 0)) {
                MEM_reset_peak_memory();
                do_render_all_options(re);
 -
 +              
                if(write_still && !G.afbreek) {
                        if(BKE_imtype_is_movie(scene->r.imtype)) {
                                /* operator checks this but incase its called from elsewhere */
        G.rendering= 0;
  }
  
-       if(render_initialize_from_main(re, bmain, scene, NULL, scene->lay, 0, 0)) {
 +void RE_RenderFreestyleStrokes(Render *re, Main *bmain, Scene *scene)
 +{
 +      re->result_ok= 0;
++      if(render_initialize_from_main(re, bmain, scene, NULL, NULL, scene->lay, 0, 0)) {
 +              do_render_fields_blur_3d(re);
 +      }
 +      re->result_ok= 1;
 +}
 +
  static int do_write_image_or_movie(Render *re, Scene *scene, bMovieHandle *mh, ReportList *reports, const char *name_override)
  {
        char name[FILE_MAX];
Simple merge
Simple merge