[Bf-blender-cvs] [16017178b24] master: Revert "Cycles: Cleanup: Don't use return on function returning void"

[Sergey Sharybin]

Commit: 16017178b24c9c84df5c1114fae8dce4796c6c26
Author: Sergey Sharybin
Date:   Thu Jun 7 11:57:57 2018 +0200
Branches: master
https://developer.blender.org/rB16017178b24c9c84df5c1114fae8dce4796c6c26

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

Not sure why exactly it is called a cleanup, the code was much more clear
and robust against possible missing return statements which are MANDATORY.

Missing return statement will:

- Cause two different BVH traversals to be run.

  Not is happening currently, but if more BVH layouts are added, it will
  become a problem.

- It is already causing assert() statements to fail, since functions are
  no longer returning when they are supposed to.

If there is any measurable reason to keep this change, let me know.
Otherwise just stick to reliable/tested/robust code.

This reverts commit ba65f7093b39a8e5f1fb869cbc347fb810a05ab9.

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

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