[Bf-blender-cvs] [00ad259939f] master: Object.raycast: error in previous commit

Germano Cavalcante noreply at git.blender.org
Sat Apr 15 07:31:54 CEST 2017


Commit: 00ad259939fe3537b7e5967598ec09799eec20af
Author: Germano Cavalcante
Date:   Sat Apr 15 02:31:33 2017 -0300
Branches: master
https://developer.blender.org/rB00ad259939fe3537b7e5967598ec09799eec20af

Object.raycast: error in previous commit

This is taking longer than I expected.

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

M	source/blender/makesrna/intern/rna_object_api.c

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

diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index b3bc2c72d34..55852139065 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -335,9 +335,11 @@ static void rna_Object_ray_cast(
 		if (isect_ray_aabb_v3_simple(origin, direction, bb->vec[0], bb->vec[6], &distmin, &distmax)) {
 			float dist = distmin >= 0 ? distmin : distmax;
 			if (dist > distance) {
+				goto finally;
 			}
 		}
 		else {
+			goto finally;
 		}
 	}
 
@@ -372,6 +374,7 @@ static void rna_Object_ray_cast(
 	}
 
 	if (*r_success == false) {
+finally:
 		zero_v3(r_location);
 		zero_v3(r_normal);
 		*r_index = -1;




More information about the Bf-blender-cvs mailing list