[Bf-codereview] More testing (issue4273042)

[brechtvanlommel at gmail.com]

Reviewers: bf-codereview_blender.org,

Description:
...

Please review this at http://codereview.appspot.com/4273042/

Affected files:
   CMakeLists.txt
   source/blender/makesrna/intern/rna_texture.c
   source/blender/render/intern/raytrace/rayobject_rtbuild.cpp


Index: source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
===================================================================
--- source/blender/render/intern/raytrace/rayobject_rtbuild.cpp	(revision  
35472)
+++ source/blender/render/intern/raytrace/rayobject_rtbuild.cpp	(working  
copy)
@@ -106,6 +106,13 @@
  	INIT_MINMAX(bb, bb+3);
  	RE_rayobject_merge_bb(o, bb, bb+3);

+	/* skip objects with inf/nan in bounding boxes. we should not be
+	   getting these, but in case it happens this avoids crashes */
+	if(!finite(bb[0]) || !finite(bb[1]) || !finite(bb[2]))
+		return;
+	if(!finite(bb[3]) || !finite(bb[4]) || !finite(bb[5]))
+		return;
+
  	/* skip objects with zero bounding box, they are of no use, and
  	   will give problems in rtbuild_heuristic_object_split later */
  	if(len_squared_v3v3(bb, bb+3) == 0.0f)
Index: source/blender/makesrna/intern/rna_texture.c
===================================================================
--- source/blender/makesrna/intern/rna_texture.c	(revision 35472)
+++ source/blender/makesrna/intern/rna_texture.c	(working copy)
@@ -911,7 +911,7 @@
  		{TEX_EASE, "EASING", 0, "Easing", "Creates a progression easing from one  
step to the next"},
  		{TEX_DIAG, "DIAGONAL", 0, "Diagonal", "Creates a diagonal progression"},
  		{TEX_SPHERE, "SPHERICAL", 0, "Spherical", "Creates a spherical  
progression"},
-		{TEX_HALO, "QUADRATIC_SPHERE", 0, "Quadratic sphere", "Creates a  
quadratic progression in the shape of a sphere"},
+		{TEX_HALO, "QUADRATIC_SPHERE", 0, "Quadratic Sphere", "Creates a  
quadratic progression in the shape of a sphere"},
  		{TEX_RAD, "RADIAL", 0, "Radial", "Creates a radial progression"},
  		{0, NULL, 0, NULL, NULL}};

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 35472)
+++ CMakeLists.txt	(working copy)
@@ -25,6 +25,8 @@
  #
  # ***** END GPL LICENSE BLOCK *****

+# Testing, testing
+
   
#-----------------------------------------------------------------------------
  # We don't allow in-source builds. This causes no end of troubles because
  # all out-of-source builds will use the CMakeCache.txt file there and even