[Bf-blender-cvs] [6ba4a91] master: Data Transfer: very minor cleanup...

Bastien Montagne noreply at git.blender.org
Tue Jul 14 11:16:25 CEST 2015


Commit: 6ba4a917a3006063427972fedf20b4db092fc646
Author: Bastien Montagne
Date:   Tue Jul 14 11:13:20 2015 +0200
Branches: master
https://developer.blender.org/rB6ba4a917a3006063427972fedf20b4db092fc646

Data Transfer: very minor cleanup...

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

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

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

diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c
index 6ef167c..8a2f239 100644
--- a/source/blender/blenkernel/intern/mesh_remap.c
+++ b/source/blender/blenkernel/intern/mesh_remap.c
@@ -1443,7 +1443,7 @@ void BKE_mesh_remap_calc_loops_from_dm(
 			bool pcent_dst_valid = false;
 
 			if ((size_t)mp_dst->totloop > islands_res_buff_size) {
-				islands_res_buff_size = (size_t)mp_dst->totloop;
+				islands_res_buff_size = (size_t)mp_dst->totloop + MREMAP_DEFAULT_BUFSIZE;
 				for (tindex = 0; tindex < num_trees; tindex++) {
 					islands_res[tindex] = MEM_reallocN(islands_res[tindex], sizeof(**islands_res) * islands_res_buff_size);
 				}
@@ -1539,7 +1539,7 @@ void BKE_mesh_remap_calc_loops_from_dm(
 								}
 							}
 							best_nor_dot = (best_nor_dot + 1.0f) * 0.5f;
-							islands_res[tindex][plidx_dst].factor = hit_dist ? (1.0f / hit_dist * best_nor_dot) : 1e18f;
+							islands_res[tindex][plidx_dst].factor = hit_dist ? (best_nor_dot / hit_dist) : 1e18f;
 							islands_res[tindex][plidx_dst].hit_dist = hit_dist;
 							islands_res[tindex][plidx_dst].index_src = best_index_src;
 						}




More information about the Bf-blender-cvs mailing list