[Bf-blender-cvs] [b380f4927e3] blender2.8: Remove bool -> int cast

Campbell Barton noreply at git.blender.org
Wed Apr 12 11:56:33 CEST 2017


Commit: b380f4927e30bc2877b4f3a760fefa0dfc3614e1
Author: Campbell Barton
Date:   Wed Apr 12 18:23:40 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBb380f4927e30bc2877b4f3a760fefa0dfc3614e1

Remove bool -> int cast

Wont work as expected on big endian systems

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

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

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

diff --git a/source/blender/blenkernel/intern/mesh_render.c b/source/blender/blenkernel/intern/mesh_render.c
index 0625662fecb..cf4992cdcb4 100644
--- a/source/blender/blenkernel/intern/mesh_render.c
+++ b/source/blender/blenkernel/intern/mesh_render.c
@@ -1323,17 +1323,17 @@ Batch *BKE_mesh_batch_cache_get_overlay_facedots(Mesh *me)
 
 		for (int i = 0; i < poly_ct; ++i) {
 			float pcenter[3], pnor[3];
-			int selected = 0;
+			bool selected = false;
 
-			mesh_render_data_pnors_pcenter_select_get(mrdata, i, pnor, pcenter, (bool *)&selected);
+			mesh_render_data_pnors_pcenter_select_get(mrdata, i, pnor, pcenter, &selected);
 
 #if USE_10_10_10
 			PackedNormal nor = { .x = 0, .y = 0, .z = -511 };
 			nor = convert_i10_v3(pnor);
-			nor.w = selected;
+			nor.w = selected ? 1 : 0;
 			VertexBuffer_set_attrib(vbo, data_id, i, &nor);
 #else
-			float nor[4] = {pnor[0], pnor[1], pnor[2], (float)selected};
+			float nor[4] = {pnor[0], pnor[1], pnor[2], selected ? 1 : 0};
 			VertexBuffer_set_attrib(vbo, data_id, i, nor);
 #endif




More information about the Bf-blender-cvs mailing list