Merging r49711 through r49737 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 9 Aug 2012 17:03:33 +0000 (17:03 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 9 Aug 2012 17:03:33 +0000 (17:03 +0000)
19 files changed:
1  2 
CMakeLists.txt
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/image.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_internal.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/external_engine.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
@@@ -2063,21 -2062,12 +2063,21 @@@ void RE_BlenderFrame(Render *re, Main *
                BLI_callback_exec(re->main, (ID *)scene, BLI_CB_EVT_RENDER_POST); /* keep after file save */
        }
  
-       BLI_callback_exec(re->main, (ID *)scene, G.afbreek ? BLI_CB_EVT_RENDER_CANCEL : BLI_CB_EVT_RENDER_COMPLETE);
+       BLI_callback_exec(re->main, (ID *)scene, G.is_break ? BLI_CB_EVT_RENDER_CANCEL : BLI_CB_EVT_RENDER_COMPLETE);
  
        /* UGLY WARNING */
-       G.rendering = 0;
+       G.is_rendering = FALSE;
  }
  
 +static void colormanage_image_for_write(Scene *scene, ImBuf *ibuf)
 +{
 +      IMB_display_buffer_to_imbuf_rect(ibuf, &scene->r.im_format.view_settings,
 +                                       &scene->r.im_format.display_settings);
 +
 +      if (ibuf)
 +              imb_freerectfloatImBuf(ibuf);
 +}
 +
  static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const char *name_override)
  {
        char name[FILE_MAX];
Simple merge
Simple merge