[Bf-blender-cvs] [bb8f7784ce1] master: Fix strict compiler compilation
Sergey Sharybin
noreply at git.blender.org
Tue Apr 18 09:41:33 CEST 2017
Commit: bb8f7784ce1b159cd47d0f960589a18c90ceb32f
Author: Sergey Sharybin
Date: Tue Apr 18 09:41:15 2017 +0200
Branches: master
https://developer.blender.org/rBbb8f7784ce1b159cd47d0f960589a18c90ceb32f
Fix strict compiler compilation
===================================================================
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 6b3f4dc7bcc..9b9f0705bb4 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -331,7 +331,7 @@ static void rna_Object_ray_cast(
/* Test BoundBox first (efficiency) */
BoundBox *bb = BKE_object_boundbox_get(ob);
float distmin;
- if (!bb || isect_ray_aabb_v3_simple(origin, direction, bb->vec[0], bb->vec[6], &distmin, NULL) && distmin <= distance) {
+ if (!bb || (isect_ray_aabb_v3_simple(origin, direction, bb->vec[0], bb->vec[6], &distmin, NULL) && distmin <= distance)) {
BVHTreeFromMesh treeData = {NULL};
More information about the Bf-blender-cvs
mailing list