[Bf-blender-cvs] [ba65f7093b3] master: Cycles: Cleanup: Don't use return on function returning void

[Lukas Stockner]

Commit: ba65f7093b39a8e5f1fb869cbc347fb810a05ab9
Author: Lukas Stockner
Date:   Mon Jun 4 00:07:17 2018 +0200
Branches: master
https://developer.blender.org/rBba65f7093b39a8e5f1fb869cbc347fb810a05ab9

Cycles: Cleanup: Don't use return on function returning void

===================================================================

M	intern/cycles/kernel/bvh/bvh.h
M	intern/cycles/kernel/bvh/bvh_local.h

===================================================================

diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h
index d3e0b25a200..c0a5bb434ea 100644
--- a/intern/cycles/kernel/bvh/bvh.h
+++ b/intern/cycles/kernel/bvh/bvh.h
@@ -212,20 +212,21 @@ ccl_device_intersect void scene_intersect_local(KernelGlobals *kg,
 {
 #ifdef __OBJECT_MOTION__
 	if(kernel_data.bvh.have_motion) {
-		return bvh_intersect_local_motion(kg,
-		                                  &ray,
-		                                  local_isect,
-		                                  local_object,
-		                                  lcg_state,
-		                                  max_hits);
+		bvh_intersect_local_motion(kg,
+		                           &ray,
+		                           local_isect,
+		                           local_object,
+		                           lcg_state,
+		                           max_hits);
+		return;
 	}
 #endif /* __OBJECT_MOTION__ */
-	return bvh_intersect_local(kg,
-	                            &ray,
-	                            local_isect,
-	                            local_object,
-	                            lcg_state,
-	                            max_hits);
+	bvh_intersect_local(kg,
+	                    &ray,
+	                    local_isect,
+	                    local_object,
+	                    lcg_state,
+	                    max_hits);
 }
 #endif
 
diff --git a/intern/cycles/kernel/bvh/bvh_local.h b/intern/cycles/kernel/bvh/bvh_local.h
index 9292cc76a5c..605d4166819 100644
--- a/intern/cycles/kernel/bvh/bvh_local.h
+++ b/intern/cycles/kernel/bvh/bvh_local.h
@@ -246,20 +246,22 @@ ccl_device_inline void BVH_FUNCTION_NAME(KernelGlobals *kg,
 	switch(kernel_data.bvh.bvh_layout) {
 #ifdef __QBVH__
 		case BVH_LAYOUT_BVH4:
-			return BVH_FUNCTION_FULL_NAME(QBVH)(kg,
-			                                    ray,
-			                                    local_isect,
-			                                    local_object,
-			                                    lcg_state,
-			                                    max_hits);
+			BVH_FUNCTION_FULL_NAME(QBVH)(kg,
+			                             ray,
+			                             local_isect,
+			                             local_object,
+			                             lcg_state,
+			                             max_hits);
+			break;
 #endif
 		case BVH_LAYOUT_BVH2:
-			return BVH_FUNCTION_FULL_NAME(BVH)(kg,
-			                                   ray,
-			                                   local_isect,
-			                                   local_object,
-			                                   lcg_state,
-			                                   max_hits);
+			BVH_FUNCTION_FULL_NAME(BVH)(kg,
+			                            ray,
+			                            local_isect,
+			                            local_object,
+			                            lcg_state,
+			                            max_hits);
+			break;
 	}
 	kernel_assert(!"Should not happen");
 }