Merged changes in the trunk up to revision 37539.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 16 Jun 2011 05:50:13 +0000 (05:50 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 16 Jun 2011 05:50:13 +0000 (05:50 +0000)
Conflicts resolved:
source/blender/render/intern/source/pipeline.c

Also fixed an inconsistent conflict resolution in the last commit with
regard to release/scripts/startup/bl_ui/properties_render.py.  This
problem resulted in empty menus in the GUI.

1  2 
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.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/shadeinput.c
source/creator/CMakeLists.txt

@@@ -2371,19 -2279,19 +2350,21 @@@ static void do_merge_fullsample(Render 
                RenderResult rres;
                int x, y, mask;
                
-               /* set all involved renders on the samplebuffers (first was done by render itself) */
+               /* enable full sample print */
+               R.i.curfsa= sample+1;
+               
+               /* set all involved renders on the samplebuffers (first was done by render itself, but needs tagged) */
                /* also function below assumes this */
-               if(sample) {
-                       Render *re1;
                        
-                       tag_scenes_for_render(re);
-                       for(re1= RenderGlobal.renderlist.first; re1; re1= re1->next) {
-                               if(re1->scene->id.flag & LIB_DOIT) {
-                                       if(re1->r.scemode & R_FULL_SAMPLE) {
+               tag_scenes_for_render(re);
+               for(re1= RenderGlobal.renderlist.first; re1; re1= re1->next) {
+                       if(re1->scene->id.flag & LIB_DOIT) {
+                               if(re1->r.scemode & R_FULL_SAMPLE) {
 -                                      if(sample)
++                                      if(sample) {
                                                read_render_result(re1, sample);
-                                               ntreeCompositTagRender(re1->scene); /* ensure node gets exec to put buffers on stack */
 +                                              composite_freestyle_renders(re1, sample);
 +                                      }
+                                       ntreeCompositTagRender(re1->scene); /* ensure node gets exec to put buffers on stack */
                                }
                        }
                }
Simple merge