[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33741] trunk/blender/source/blender/ render/intern/source/pipeline.c: Bug fix:

Ton Roosendaal ton at blender.org
Fri Dec 17 16:24:03 CET 2010


Revision: 33741
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33741
Author:   ton
Date:     2010-12-17 16:24:03 +0100 (Fri, 17 Dec 2010)

Log Message:
-----------
Bug fix:

When compositing without render (Enable composite, no renderlayer nodes)
the option Full Sample AA caused havoc. Added warning for this case
and gracefully stop render.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2010-12-17 14:49:38 UTC (rev 33740)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2010-12-17 15:24:03 UTC (rev 33741)
@@ -2726,11 +2726,17 @@
 				if(node->type==CMP_NODE_COMPOSITE)
 					break;
 			
-			
 			if(node==NULL) {
 				error(erh, "No Render Output Node in Scene");
 				return 0;
 			}
+			
+			if(scene->r.scemode & R_FULL_SAMPLE) {
+				if(composite_needs_render(scene)==0) {
+					error(erh, "Full Sample AA not supported without 3d rendering");
+					return 0;
+				}
+			}
 		}
 	}
 	





More information about the Bf-blender-cvs mailing list