Hoy día subo el archivo actualizado, creí haberlo subido antes. Saludos -- Sven Sent from my Android phone with K-9 Mail. Please excuse my brevity.
Campbell Barton <ideasma...@gmail.com> escribió: Revision: 40376 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40376 Author: campbellbarton Date: 2011-09-20 01:35:39 +0000 (Tue, 20 Sep 2011) Log Message: ----------- fix for warnings after texface commit, also comment blender sphinx theme for api reference until we get an update for 'Naiad' Modified Paths: -------------- trunk/blender/doc/python_api/sphinx_doc_gen.py trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c trunk/blender/source/blender/blenkernel/intern/material.c trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py _____________________________________________ --- trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-09-19 23:24:14 UTC (rev 40375) +++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-09-20 01:35:39 UTC (rev 40376) @@ -1036,8 +1036,12 @@ fw("copyright = u'Blender Foundation'\n") fw("version = '%s - API'\n" % version_string) fw("release = '%s - API'\n" % version_string) - fw("html_theme = 'blender-org'\n") - fw("html_theme_path = ['../']\n") + + # until we get a theme for 'Naiad' + if 0: + fw("html_theme = 'blender-org'\n") + fw("html_theme_path = ['../']\n") + fw("html_favicon = 'favicon.ico'\n") # not helpful since the source us generated, adds to upload size. fw("html_copy_source = False\n") Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c _____________________________________________ --- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-09-19 23:24:14 UTC (rev 40375) +++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-09-20 01:35:39 UTC (rev 40376) @@ -1060,7 +1060,7 @@ 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); Modified: trunk/blender/source/blender/blenkernel/intern/material.c _____________________________________________ --- trunk/blender/source/blender/blenkernel/intern/material.c 2011-09-19 23:24:14 UTC (rev 40375) +++ trunk/blender/source/blender/blenkernel/intern/material.c 2011-09-20 01:35:39 UTC (rev 40376) @@ -1771,18 +1771,17 @@ 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 @@ 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) Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c _____________________________________________ --- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-09-19 23:24:14 UTC (rev 40375) +++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-09-20 01:35:39 UTC (rev 40376) @@ -1374,7 +1374,7 @@ 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); _____________________________________________ Bf-blender-cvs mailing list bf-blender-...@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
