[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55534] trunk/blender: Cycles:

Thomas Dinges blender at dingto.org
Sat Mar 23 11:11:29 CET 2013


Revision: 55534
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55534
Author:   dingto
Date:     2013-03-23 10:11:29 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
Cycles:
* Avoid an unnecessary condition in light.cpp, (totarea > 0.0f) is always true inside the "if(kintegrator->use_direct_light)" branch.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/light.cpp
    trunk/blender/source/blender/editors/include/UI_resources.h

Modified: trunk/blender/intern/cycles/render/light.cpp
===================================================================
--- trunk/blender/intern/cycles/render/light.cpp	2013-03-23 08:47:29 UTC (rev 55533)
+++ trunk/blender/intern/cycles/render/light.cpp	2013-03-23 10:11:29 UTC (rev 55534)
@@ -332,7 +332,7 @@
 
 	if(kintegrator->use_direct_light) {
 		/* number of emissives */
-		kintegrator->num_distribution = (totarea > 0.0f)? num_distribution: 0;
+		kintegrator->num_distribution = num_distribution;
 
 		/* precompute pdfs */
 		kintegrator->pdf_triangles = 0.0f;

Modified: trunk/blender/source/blender/editors/include/UI_resources.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_resources.h	2013-03-23 08:47:29 UTC (rev 55533)
+++ trunk/blender/source/blender/editors/include/UI_resources.h	2013-03-23 10:11:29 UTC (rev 55534)
@@ -307,4 +307,4 @@
 
 void UI_make_axis_color(const unsigned char *src_col, unsigned char *dst_col, const char axis);
 
-#endif /*  UI_ICONS_H */
+#endif /*  UI_RESOURCES_H */




More information about the Bf-blender-cvs mailing list