[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41452] trunk/blender: quiet some warnings .

[Campbell Barton]

Revision: 41452
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41452
Author:   campbellbarton
Date:     2011-11-01 22:51:10 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
quiet some warnings.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_consistency_check_config.py
    trunk/blender/source/blender/blenfont/intern/blf_lang.c
    trunk/blender/source/blender/blenkernel/intern/smoke.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check_config.py	2011-11-01 22:21:21 UTC (rev 41451)
+++ trunk/blender/build_files/cmake/cmake_consistency_check_config.py	2011-11-01 22:51:10 UTC (rev 41452)
@@ -29,8 +29,8 @@
     "source/blender/imbuf/intern/imbuf_cocoa.m",
     "extern/recastnavigation/Recast/Source/RecastLog.cpp",
     "extern/recastnavigation/Recast/Source/RecastTimer.cpp",
-    "entern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
-    "entern/audaspace/SRC/AUD_SRCResampleReader.cpp",
+    "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
+    "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
 
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
@@ -44,7 +44,7 @@
     "extern/eltopo/common/meshes/ObjLoader.hpp",
     "extern/eltopo/common/meshes/TriangleIndex.hpp",
     "extern/eltopo/common/meshes/meshloader.h",
-    "extern/eltopo/eltopo3d/broadphase_blenderbvh.h"
+    "extern/eltopo/eltopo3d/broadphase_blenderbvh.h",
     "extern/recastnavigation/Recast/Include/RecastLog.h",
     "extern/recastnavigation/Recast/Include/RecastTimer.h",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.h",

Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c	2011-11-01 22:21:21 UTC (rev 41451)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c	2011-11-01 22:51:10 UTC (rev 41452)
@@ -120,7 +120,7 @@
 	const char *short_locale;
 	int ok= 1;
 #if defined (_WIN32) && !defined(FREE_WINDOWS)
-	char *long_locale = locales[ 2 * U.language];
+	const char *long_locale = locales[ 2 * U.language];
 #endif
 
 	if((U.transopts&USER_DOTRANSLATE)==0)

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2011-11-01 22:21:21 UTC (rev 41451)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2011-11-01 22:51:10 UTC (rev 41452)
@@ -77,6 +77,8 @@
 
 #include "BKE_smoke.h"
 
+#ifdef WITH_SMOKE
+
 #ifdef _WIN32
 #include <time.h>
 #include <stdio.h>
@@ -131,12 +133,13 @@
 
 #define TRI_UVOFFSET (1./4.)
 
-#ifdef WITH_SMOKE
 /* forward declerations */
 static void calcTriangleDivs(Object *ob, MVert *verts, int numverts, MFace *tris, int numfaces, int numtris, int **tridivs, float cell_len);
 static void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int correct);
 static void fill_scs_points(Object *ob, DerivedMesh *dm, SmokeCollSettings *scs);
+
 #else /* WITH_SMOKE */
+
 /* Stubs to use when smoke is disabled */
 struct WTURBULENCE *smoke_turbulence_init(int *UNUSED(res), int UNUSED(amplify), int UNUSED(noisetype)) { return NULL; }
 struct FLUID_3D *smoke_init(int *UNUSED(res), float *UNUSED(p0)) { return NULL; }
@@ -146,9 +149,11 @@
 void smoke_initBlenderRNA(struct FLUID_3D *UNUSED(fluid), float *UNUSED(alpha), float *UNUSED(beta), float *UNUSED(dt_factor), float *UNUSED(vorticity), int *UNUSED(border_colli)) {}
 long long smoke_get_mem_req(int UNUSED(xres), int UNUSED(yres), int UNUSED(zres), int UNUSED(amplify)) { return 0; }
 void smokeModifier_do(SmokeModifierData *UNUSED(smd), Scene *UNUSED(scene), Object *UNUSED(ob), DerivedMesh *UNUSED(dm)) {}
+
 #endif /* WITH_SMOKE */
 
 #ifdef WITH_SMOKE
+
 static int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, DerivedMesh *dm)
 {
 	if((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain && !smd->domain->fluid)

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-11-01 22:21:21 UTC (rev 41451)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-11-01 22:51:10 UTC (rev 41452)
@@ -9124,7 +9124,6 @@
 	}
 	if(main->versionfile <= 245) {
 		Scene *sce;
-		bScreen *sc;
 		Object *ob;
 		Image *ima;
 		Lamp *la;