fix for warnings after texface commit, also comment blender sphinx theme for api...

diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 91248c084060fb5d46a2d43ebcc5048f75e5374d..1792cb002109f8f09fc73bf6bbe5407cdbd4dce7 100644 (file)
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1036,8 +1036,12 @@ def rna2sphinx(BASEPATH):
     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")

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index e6a472827adaa721620969471d4217efb6e9fddb..e955a47b1e76cf0e1a0795d6237fc2a65082dae0 100644 (file)
--- 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 956d7b01b3bc1a04a0c7398ab2a676e835d1cae2..60ba5654f77376c266375aa00268201a2faa063a 100644 (file)
--- 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 44242507616c0c175f4a242880c0551d31fd32af..225ada0e6240cee38b1372d14a19f52f3b16d0b1 100644 (file)
--- 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);