[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44650] trunk/blender/source/blender/ makesrna/intern/rna_mesh.c: tesselat -> tessellat in UI messages, + style edits.
Bastien Montagne
montagne29 at wanadoo.fr
Mon Mar 5 17:19:40 CET 2012
Revision: 44650
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44650
Author: mont29
Date: 2012-03-05 16:19:16 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
tesselat -> tessellat in UI messages, + style edits.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2012-03-05 14:25:52 UTC (rev 44649)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2012-03-05 16:19:16 UTC (rev 44650)
@@ -110,10 +110,10 @@
static void rna_Mesh_update_data(Main *bmain, Scene *scene, PointerRNA *ptr)
{
- ID *id= ptr->id.data;
+ ID *id = ptr->id.data;
/* cheating way for importers to avoid slow updates */
- if(id->us > 0) {
+ if (id->us > 0) {
DAG_id_tag_update(id, 0);
WM_main_add_notifier(NC_GEOM|ND_DATA, id);
}
@@ -121,18 +121,18 @@
static void rna_Mesh_update_select(Main *bmain, Scene *scene, PointerRNA *ptr)
{
- ID *id= ptr->id.data;
+ ID *id = ptr->id.data;
/* cheating way for importers to avoid slow updates */
- if(id->us > 0) {
+ if (id->us > 0) {
WM_main_add_notifier(NC_GEOM|ND_SELECT, id);
}
}
void rna_Mesh_update_draw(Main *bmain, Scene *scene, PointerRNA *ptr)
{
- ID *id= ptr->id.data;
+ ID *id = ptr->id.data;
/* cheating way for importers to avoid slow updates */
- if(id->us > 0) {
+ if (id->us > 0) {
WM_main_add_notifier(NC_GEOM|ND_DATA, id);
}
}
@@ -157,13 +157,13 @@
}
static void rna_MeshVertex_normal_get(PointerRNA *ptr, float *value)
{
- MVert *mvert= (MVert*)ptr->data;
+ MVert *mvert = (MVert*)ptr->data;
normal_short_to_float_v3(value, mvert->no);
}
static void rna_MeshVertex_normal_set(PointerRNA *ptr, const float *value)
{
- MVert *mvert= (MVert*)ptr->data;
+ MVert *mvert = (MVert*)ptr->data;
float no[3];
copy_v3_v3(no, value);
@@ -173,44 +173,44 @@
static float rna_MeshVertex_bevel_weight_get(PointerRNA *ptr)
{
- MVert *mvert= (MVert*)ptr->data;
+ MVert *mvert = (MVert*)ptr->data;
return mvert->bweight/255.0f;
}
static void rna_MeshVertex_bevel_weight_set(PointerRNA *ptr, float value)
{
- MVert *mvert= (MVert*)ptr->data;
- mvert->bweight= (char)(CLAMPIS(value*255.0f, 0, 255));
+ MVert *mvert = (MVert*)ptr->data;
+ mvert->bweight = (char)(CLAMPIS(value*255.0f, 0, 255));
}
static float rna_MEdge_bevel_weight_get(PointerRNA *ptr)
{
- MEdge *medge= (MEdge*)ptr->data;
+ MEdge *medge = (MEdge*)ptr->data;
return medge->bweight/255.0f;
}
static void rna_MEdge_bevel_weight_set(PointerRNA *ptr, float value)
{
- MEdge *medge= (MEdge*)ptr->data;
- medge->bweight= (char)(CLAMPIS(value*255.0f, 0, 255));
+ MEdge *medge = (MEdge*)ptr->data;
+ medge->bweight = (char)(CLAMPIS(value*255.0f, 0, 255));
}
static float rna_MEdge_crease_get(PointerRNA *ptr)
{
- MEdge *medge= (MEdge*)ptr->data;
+ MEdge *medge = (MEdge*)ptr->data;
return medge->crease/255.0f;
}
static void rna_MEdge_crease_set(PointerRNA *ptr, float value)
{
- MEdge *medge= (MEdge*)ptr->data;
- medge->crease= (char)(CLAMPIS(value*255.0f, 0, 255));
+ MEdge *medge = (MEdge*)ptr->data;
+ medge->crease = (char)(CLAMPIS(value*255.0f, 0, 255));
}
static void rna_MeshPolygon_normal_get(PointerRNA *ptr, float *values)
{
Mesh *me = rna_mesh(ptr);
- MPoly *mp= (MPoly*)ptr->data;
+ MPoly *mp = (MPoly*)ptr->data;
/* BMESH_TODO: might be faster to look for a CD_NORMALS layer and use that */
mesh_calc_poly_normal(mp, me->mloop+mp->loopstart, me->mvert, values);
@@ -227,87 +227,89 @@
static void rna_MeshFace_normal_get(PointerRNA *ptr, float *values)
{
Mesh *me = rna_mesh(ptr);
- MFace *mface= (MFace*)ptr->data;
+ MFace *mface = (MFace*)ptr->data;
- if(mface->v4)
- normal_quad_v3( values,me->mvert[mface->v1].co, me->mvert[mface->v2].co, me->mvert[mface->v3].co, me->mvert[mface->v4].co);
+ if (mface->v4)
+ normal_quad_v3(values, me->mvert[mface->v1].co, me->mvert[mface->v2].co,
+ me->mvert[mface->v3].co, me->mvert[mface->v4].co);
else
- normal_tri_v3( values,me->mvert[mface->v1].co, me->mvert[mface->v2].co, me->mvert[mface->v3].co);
+ normal_tri_v3(values, me->mvert[mface->v1].co, me->mvert[mface->v2].co, me->mvert[mface->v3].co);
}
static float rna_MeshFace_area_get(PointerRNA *ptr)
{
Mesh *me = rna_mesh(ptr);
- MFace *mface= (MFace*)ptr->data;
+ MFace *mface = (MFace*)ptr->data;
- if(mface->v4)
- return area_quad_v3(me->mvert[mface->v1].co, me->mvert[mface->v2].co, me->mvert[mface->v3].co, me->mvert[mface->v4].co);
+ if (mface->v4)
+ return area_quad_v3(me->mvert[mface->v1].co, me->mvert[mface->v2].co, me->mvert[mface->v3].co,
+ me->mvert[mface->v4].co);
else
return area_tri_v3(me->mvert[mface->v1].co, me->mvert[mface->v2].co, me->mvert[mface->v3].co);
}
static void rna_MeshTextureFace_uv1_get(PointerRNA *ptr, float *values)
{
- MTFace *mtface= (MTFace*)ptr->data;
+ MTFace *mtface = (MTFace*)ptr->data;
- values[0]= mtface->uv[0][0];
- values[1]= mtface->uv[0][1];
+ values[0] = mtface->uv[0][0];
+ values[1] = mtface->uv[0][1];
}
static void rna_MeshTextureFace_uv1_set(PointerRNA *ptr, const float *values)
{
- MTFace *mtface= (MTFace*)ptr->data;
+ MTFace *mtface = (MTFace*)ptr->data;
- mtface->uv[0][0]= values[0];
- mtface->uv[0][1]= values[1];
+ mtface->uv[0][0] = values[0];
+ mtface->uv[0][1] = values[1];
}
static void rna_MeshTextureFace_uv2_get(PointerRNA *ptr, float *values)
{
- MTFace *mtface= (MTFace*)ptr->data;
+ MTFace *mtface = (MTFace*)ptr->data;
- values[0]= mtface->uv[1][0];
- values[1]= mtface->uv[1][1];
+ values[0] = mtface->uv[1][0];
+ values[1] = mtface->uv[1][1];
}
static void rna_MeshTextureFace_uv2_set(PointerRNA *ptr, const float *values)
{
- MTFace *mtface= (MTFace*)ptr->data;
+ MTFace *mtface = (MTFace*)ptr->data;
- mtface->uv[1][0]= values[0];
- mtface->uv[1][1]= values[1];
+ mtface->uv[1][0] = values[0];
+ mtface->uv[1][1] = values[1];
}
static void rna_MeshTextureFace_uv3_get(PointerRNA *ptr, float *values)
{
- MTFace *mtface= (MTFace*)ptr->data;
+ MTFace *mtface = (MTFace*)ptr->data;
- values[0]= mtface->uv[2][0];
- values[1]= mtface->uv[2][1];
+ values[0] = mtface->uv[2][0];
+ values[1] = mtface->uv[2][1];
}
static void rna_MeshTextureFace_uv3_set(PointerRNA *ptr, const float *values)
{
- MTFace *mtface= (MTFace*)ptr->data;
+ MTFace *mtface = (MTFace*)ptr->data;
- mtface->uv[2][0]= values[0];
- mtface->uv[2][1]= values[1];
+ mtface->uv[2][0] = values[0];
+ mtface->uv[2][1] = values[1];
}
static void rna_MeshTextureFace_uv4_get(PointerRNA *ptr, float *values)
{
- MTFace *mtface= (MTFace*)ptr->data;
+ MTFace *mtface = (MTFace*)ptr->data;
- values[0]= mtface->uv[3][0];
- values[1]= mtface->uv[3][1];
+ values[0] = mtface->uv[3][0];
+ values[1] = mtface->uv[3][1];
}
static void rna_MeshTextureFace_uv4_set(PointerRNA *ptr, const float *values)
{
- MTFace *mtface= (MTFace*)ptr->data;
+ MTFace *mtface = (MTFace*)ptr->data;
- mtface->uv[3][0]= values[0];
- mtface->uv[3][1]= values[1];
+ mtface->uv[3][0] = values[0];
+ mtface->uv[3][1] = values[1];
}
static int rna_CustomDataData_numverts(PointerRNA *ptr, int type)
@@ -318,9 +320,9 @@
int a, b;
for (cdl = fdata->layers, a = 0; a < fdata->totlayer; cdl++, a++) {
- if(cdl->type == type) {
+ if (cdl->type == type) {
b = ((char *)ptr->data - ((char*)cdl->data)) / CustomData_sizeof(type);
- if(b >= 0 && b < me->totface) {
+ if (b >= 0 && b < me->totface) {
return (me->mface[b].v4 ? 4 : 3);
}
}
@@ -331,23 +333,23 @@
static int rna_MeshTextureFace_uv_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
{
- length[0]= rna_CustomDataData_numverts(ptr, CD_MTFACE);
- length[1]= 2;
+ length[0] = rna_CustomDataData_numverts(ptr, CD_MTFACE);
+ length[1] = 2;
return length[0]*length[1];
}
static void rna_MeshTextureFace_uv_get(PointerRNA *ptr, float *values)
{
- MTFace *mtface= (MTFace*)ptr->data;
- int totvert= rna_CustomDataData_numverts(ptr, CD_MTFACE);
+ MTFace *mtface = (MTFace*)ptr->data;
+ int totvert = rna_CustomDataData_numverts(ptr, CD_MTFACE);
memcpy(values, mtface->uv, totvert * 2 * sizeof(float));
}
static void rna_MeshTextureFace_uv_set(PointerRNA *ptr, const float *values)
{
- MTFace *mtface= (MTFace*)ptr->data;
- int totvert= rna_CustomDataData_numverts(ptr, CD_MTFACE);
+ MTFace *mtface = (MTFace*)ptr->data;
+ int totvert = rna_CustomDataData_numverts(ptr, CD_MTFACE);
memcpy(mtface->uv, values, totvert * 2 * sizeof(float));
}
@@ -355,97 +357,97 @@
/* notice red and blue are swapped */
static void rna_MeshColor_color1_get(PointerRNA *ptr, float *values)
{
- MCol *mcol= (MCol*)ptr->data;
+ MCol *mcol = (MCol*)ptr->data;
- values[2]= (&mcol[0].r)[0]/255.0f;
- values[1]= (&mcol[0].r)[1]/255.0f;
- values[0]= (&mcol[0].r)[2]/255.0f;
+ values[2] = (&mcol[0].r)[0]/255.0f;
+ values[1] = (&mcol[0].r)[1]/255.0f;
+ values[0] = (&mcol[0].r)[2]/255.0f;
}
static void rna_MeshColor_color1_set(PointerRNA *ptr, const float *values)
{
- MCol *mcol= (MCol*)ptr->data;
+ MCol *mcol = (MCol*)ptr->data;
- (&mcol[0].r)[2]= (char)(CLAMPIS(values[0]*255.0f, 0, 255));
- (&mcol[0].r)[1]= (char)(CLAMPIS(values[1]*255.0f, 0, 255));
- (&mcol[0].r)[0]= (char)(CLAMPIS(values[2]*255.0f, 0, 255));
+ (&mcol[0].r)[2] = (char)(CLAMPIS(values[0]*255.0f, 0, 255));
+ (&mcol[0].r)[1] = (char)(CLAMPIS(values[1]*255.0f, 0, 255));
+ (&mcol[0].r)[0] = (char)(CLAMPIS(values[2]*255.0f, 0, 255));
}
static void rna_MeshColor_color2_get(PointerRNA *ptr, float *values)
{
- MCol *mcol= (MCol*)ptr->data;
+ MCol *mcol = (MCol*)ptr->data;
- values[2]= (&mcol[1].r)[0]/255.0f;
- values[1]= (&mcol[1].r)[1]/255.0f;
- values[0]= (&mcol[1].r)[2]/255.0f;
+ values[2] = (&mcol[1].r)[0]/255.0f;
+ values[1] = (&mcol[1].r)[1]/255.0f;
+ values[0] = (&mcol[1].r)[2]/255.0f;
}
static void rna_MeshColor_color2_set(PointerRNA *ptr, const float *values)
{
- MCol *mcol= (MCol*)ptr->data;
+ MCol *mcol = (MCol*)ptr->data;
- (&mcol[1].r)[2]= (char)(CLAMPIS(values[0]*255.0f, 0, 255));
- (&mcol[1].r)[1]= (char)(CLAMPIS(values[1]*255.0f, 0, 255));
- (&mcol[1].r)[0]= (char)(CLAMPIS(values[2]*255.0f, 0, 255));
+ (&mcol[1].r)[2] = (char)(CLAMPIS(values[0]*255.0f, 0, 255));
+ (&mcol[1].r)[1] = (char)(CLAMPIS(values[1]*255.0f, 0, 255));
+ (&mcol[1].r)[0] = (char)(CLAMPIS(values[2]*255.0f, 0, 255));
}
static void rna_MeshColor_color3_get(PointerRNA *ptr, float *values)
{
- MCol *mcol= (MCol*)ptr->data;
+ MCol *mcol = (MCol*)ptr->data;
- values[2]= (&mcol[2].r)[0]/255.0f;
- values[1]= (&mcol[2].r)[1]/255.0f;
- values[0]= (&mcol[2].r)[2]/255.0f;
+ values[2] = (&mcol[2].r)[0]/255.0f;
+ values[1] = (&mcol[2].r)[1]/255.0f;
+ values[0] = (&mcol[2].r)[2]/255.0f;
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list