[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36175] trunk/blender/source/blender: style changes & replace some memset's with zero initializers.
Campbell Barton
ideasman42 at gmail.com
Fri Apr 15 03:43:32 CEST 2011
Revision: 36175
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36175
Author: campbellbarton
Date: 2011-04-15 01:43:30 +0000 (Fri, 15 Apr 2011)
Log Message:
-----------
style changes & replace some memset's with zero initializers.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-04-15 01:32:37 UTC (rev 36174)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-04-15 01:43:30 UTC (rev 36175)
@@ -914,7 +914,7 @@
float (*vertexNos)[3]= emdm->vertexNos;
EditVert *eve;
EditFace *efa;
- DMVertexAttribs attribs;
+ DMVertexAttribs attribs= {{{0}}};
GPUVertexAttribs gattribs;
MTFace *tf;
int transp, new_transp, orig_transp, tfoffset;
@@ -928,8 +928,6 @@
layer = CustomData_get_layer_index(&em->fdata, CD_MTFACE);
tfoffset = (layer == -1)? -1: em->fdata.layers[layer].offset;
- memset(&attribs, 0, sizeof(attribs));
-
/* always use smooth shading even for flat faces, else vertex colors wont interpolate */
glShadeModel(GL_SMOOTH);
@@ -2522,8 +2520,7 @@
//assert(vert_index>=0 && vert_index<4);
SGLSLMeshToTangent * pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData;
- if(pMesh->mtface!=NULL)
- {
+ if(pMesh->mtface!=NULL) {
float * uv = pMesh->mtface[face_num].uv[vert_index];
fUV[0]=uv[0]; fUV[1]=uv[1];
}
@@ -2539,8 +2536,7 @@
SGLSLMeshToTangent * pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData;
const int smoothnormal = (pMesh->mface[face_num].flag & ME_SMOOTH);
- if(!smoothnormal) // flat
- {
+ if(!smoothnormal) { // flat
if(pMesh->precomputedFaceNormals) {
VECCOPY(fNorm, &pMesh->precomputedFaceNormals[3*face_num]);
}
@@ -2619,14 +2615,10 @@
// new computation method
iCalcNewMethod = 1;
- if(iCalcNewMethod!=0)
- {
- SGLSLMeshToTangent mesh2tangent;
- SMikkTSpaceContext sContext;
- SMikkTSpaceInterface sInterface;
- memset(&mesh2tangent, 0, sizeof(SGLSLMeshToTangent));
- memset(&sContext, 0, sizeof(SMikkTSpaceContext));
- memset(&sInterface, 0, sizeof(SMikkTSpaceInterface));
+ if(iCalcNewMethod != 0) {
+ SGLSLMeshToTangent mesh2tangent= {0};
+ SMikkTSpaceContext sContext= {0};
+ SMikkTSpaceInterface sInterface= {0};
mesh2tangent.precomputedFaceNormals = nors;
mesh2tangent.mtface = mtface;
@@ -2649,8 +2641,7 @@
iCalcNewMethod = genTangSpaceDefault(&sContext);
}
- if(!iCalcNewMethod)
- {
+ if(!iCalcNewMethod) {
/* sum tangents at connected vertices */
for(i=0, tf=mtface, mf=mface; i < totface; mf++, tf++, i++) {
v1= &mvert[mf->v1];
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c 2011-04-15 01:32:37 UTC (rev 36174)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c 2011-04-15 01:43:30 UTC (rev 36175)
@@ -543,8 +543,7 @@
MTFace *tface= RE_vlakren_get_tface(pMesh->obr, vlr, pMesh->obr->actmtface, NULL, 0);
const float *coord;
- if(tface!=NULL)
- {
+ if(tface != NULL) {
coord= tface->uv[vert_index];
fUV[0]= coord[0]; fUV[1]= coord[1];
}
@@ -570,8 +569,7 @@
SRenderMeshToTangent * pMesh = (SRenderMeshToTangent *) pContext->m_pUserData;
VlakRen *vlr= RE_findOrAddVlak(pMesh->obr, face_num);
float * ftang= RE_vlakren_get_nmap_tangent(pMesh->obr, vlr, 1);
- if(ftang!=NULL)
- {
+ if(ftang!=NULL) {
VECCOPY(&ftang[iVert*4+0], fvTangent);
ftang[iVert*4+3]=fSign;
}
More information about the Bf-blender-cvs
mailing list