Commit: f074e9ba2d40b9daae9b3e089325f0598894f0c8
Author: Bastien Montagne
Date: Fri Aug 8 14:19:34 2014 +0200
Branches: temp_custom_loop_normals
https://developer.blender.org/rBf074e9ba2d40b9daae9b3e089325f0598894f0c8
Fix remaining floats for clnors data :/
===================================================================
M source/blender/blenkernel/intern/customdata.c
M source/blender/makesrna/intern/rna_mesh_api.c
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.c
b/source/blender/blenkernel/intern/customdata.c
index d28f731..05729f9 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1200,7 +1200,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
/* 40: CD_TESSLOOPNORMAL */
{sizeof(short[4][3]), "", 0, NULL, NULL, NULL, NULL, layerSwap_flnor,
NULL},
/* 41: CD_CUSTOMLOOPNORMAL */
- {sizeof(short[2]), "vec2f", 1, NULL, NULL, NULL, layerInterp_clnor,
NULL, layerDefault_clnor},
+ {sizeof(short[2]), "vec2s", 1, NULL, NULL, NULL, layerInterp_clnor,
NULL, layerDefault_clnor},
};
/* note, numbers are from trunk and need updating for bmesh */
diff --git a/source/blender/makesrna/intern/rna_mesh_api.c
b/source/blender/makesrna/intern/rna_mesh_api.c
index aec5b0a..cea845e 100644
--- a/source/blender/makesrna/intern/rna_mesh_api.c
+++ b/source/blender/makesrna/intern/rna_mesh_api.c
@@ -73,7 +73,7 @@ static void rna_Mesh_calc_normals_split(Mesh *mesh, float
min_angle)
{
float (*r_loopnors)[3];
float (*polynors)[3];
- float (*clnors)[2] = NULL;
+ short (*clnors)[2] = NULL;
bool free_polynors = false;
if (CustomData_has_layer(&mesh->ldata, CD_NORMAL)) {
@@ -157,7 +157,7 @@ static void rna_Mesh_define_normals_split_custom_do(Mesh
*mesh, float (*custom_l
const float
*custom_loopnors_factors, const bool use_vertices)
{
float (*polynors)[3];
- float (*clnors)[2];
+ short (*clnors)[2];
const int numloops = mesh->totloop;
bool free_polynors = false;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
