[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56007] trunk/blender/source/blender/ makesrna/intern/rna_scene.c: Cycles / Save Buffers:

[Thomas Dinges]

Revision: 56007
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56007
Author:   dingto
Date:     2013-04-13 12:49:22 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
Cycles / Save Buffers:
* Save Buffers could not be disabled in the UI, when "Full Sample" was enabled 
in Blender Internal. 

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c    2013-04-13 
12:03:20 UTC (rev 56006)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c    2013-04-13 
12:49:22 UTC (rev 56007)
@@ -686,10 +686,14 @@
 static int rna_RenderSettings_save_buffers_get(PointerRNA *ptr)
 {
        RenderData *rd = (RenderData *)ptr->data;
+       Scene *scene = (Scene *)ptr->id.data;
+       
        if (rd->mode & R_BORDER)
                return 0;
-       else
+       else if (!BKE_scene_use_new_shading_nodes(scene))
                return (rd->scemode & (R_EXR_TILE_FILE | R_FULL_SAMPLE)) != 0;
+       else 
+               return (rd->scemode & R_EXR_TILE_FILE);
 }
 
 static int rna_RenderSettings_full_sample_get(PointerRNA *ptr)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs