[Bf-blender-cvs] [654068a] compositor-2016: Fix T48547: Shrinkwrap fails w/ auxiliary target

Campbell Barton noreply at git.blender.org
Wed Jun 8 21:51:36 CEST 2016


Commit: 654068a0b0e6802c23e965d488caf2274b1d4f48
Author: Campbell Barton
Date:   Tue May 31 14:35:35 2016 +1000
Branches: compositor-2016
https://developer.blender.org/rB654068a0b0e6802c23e965d488caf2274b1d4f48

Fix T48547: Shrinkwrap fails w/ auxiliary target

Error in 0b5a0d84

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

M	source/blender/blenkernel/intern/shrinkwrap.c

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

diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index b9f7afb..518d8d6 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -435,7 +435,7 @@ static void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc, bool for
 				}
 			}
 			else {
-				if ((aux_tree = bvhtree_from_mesh_looptri(&dmauxdata_stack, calc->target, 0.0, 4, 6)) != NULL) {
+				if ((aux_tree = bvhtree_from_mesh_looptri(&dmauxdata_stack, auxMesh, 0.0, 4, 6)) != NULL) {
 					aux_callback = dmauxdata_stack.raycast_callback;
 					auxData = &dmauxdata_stack;
 				}




More information about the Bf-blender-cvs mailing list