diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-20 05:35:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-20 05:35:39 +0400 |
commit | 00de0cd6a76caf52dafef8d247b3d7cc087f0f32 (patch) | |
tree | 7e1bab4692b6e35c5f4b8181adc1544515dad8dc /source | |
parent | b263aefb0ec4d6b46b4cd7e4b15ac7f99af4c59e (diff) |
fix for warnings after texface commit, also comment blender sphinx theme for api reference until we get an update for 'Naiad'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 7 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index e6a472827ad..e955a47b1e7 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1060,7 +1060,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, vo DMVertexAttribs attribs; MVert *mvert = cddm->mvert; MFace *mface = cddm->mface; - MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE); + /* MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE); */ /* UNUSED */ float (*nors)[3] = dm->getFaceDataArray(dm, CD_NORMAL); int a, b, dodraw, matnr, new_matnr; int orig, *index = dm->getFaceDataArray(dm, CD_ORIGINDEX); diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 956d7b01b3b..60ba5654f77 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1771,18 +1771,17 @@ int do_version_tface(Main *main, int fileload) int a; int flag; int index; - int nummat; /* sometimes mesh has no materials but will need a new one. In those * cases we need to ignore the mf->mat_nr and only look at the face - * mode because it can be zero as unitialized or the 1st created material + * mode because it can be zero as uninitialized or the 1st created material */ int nomaterialslots; /* alert to user to check the console */ int nowarning = 1; - /* mark all the materials to convertion with a flag + /* mark all the materials to conversion with a flag * if there is tface create a complete flag for that storing in flag * if there is tface and flag > 0: creates a new flag based on this face * if flags are different set flag to -1 @@ -1869,7 +1868,7 @@ int do_version_tface(Main *main, int fileload) ma->game.flag = -flag; /* some people uses multitexture with TexFace by creating a texture - * channel which not necessarly the tf->tpage image. But the game engine + * channel which not neccessarly the tf->tpage image. But the game engine * was enabling it. Now it's required to set "Face Texture [Alpha] in the * material settings. */ if(!fileload) diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 44242507616..225ada0e624 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1374,7 +1374,7 @@ static void ccgDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, v CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss); GPUVertexAttribs gattribs; DMVertexAttribs attribs= {{{NULL}}}; - MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE); + /* MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE); */ /* UNUSED */ int gridSize = ccgSubSurf_getGridSize(ss); int gridFaces = gridSize - 1; int edgeSize = ccgSubSurf_getEdgeSize(ss); |