[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55776] branches/soc-2008-mxcurioni/source /blender: quiet warnings (building with -Werror)

[Campbell Barton]

Revision: 55776
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55776
Author:   campbellbarton
Date:     2013-04-04 11:47:48 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
quiet warnings (building with -Werror)

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c	2013-04-04 09:59:06 UTC (rev 55775)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c	2013-04-04 11:47:48 UTC (rev 55776)
@@ -580,16 +580,19 @@
 				}
 				SEQ_END
 			}
+			/* TODO, keep this or not? - campbell */
+#if 0
 			{
 				SceneRenderLayer *srl = scene->r.layers.first;
 
 				for(; srl; srl = srl->next) {
-					FreestyleModuleConfig* module = srl->freestyleConfig.modules.first;
+					FreestyleModuleConfig *module = srl->freestyleConfig.modules.first;
 					for (; module; module = module->next) {
 						rewrite_path_fixed(module->module_path, visit_cb, absbase, bpath_user_data);
 					}
  				}
  			}
+#endif
 			break;
 		}
 		case ID_ME:

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp	2013-04-04 09:59:06 UTC (rev 55775)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp	2013-04-04 11:47:48 UTC (rev 55776)
@@ -51,11 +51,13 @@
 	loadIdentity(projection_matrix_);
 }
 
+#if 0  /* UNUSED, gives warning in gcc */
 NodeCamera::NodeCamera(const NodeCamera& iBrother) : camera_type_(iBrother.camera_type_)
 {
 	memcpy(modelview_matrix_, iBrother.modelview_matrix_, 16 * sizeof(double));
 	memcpy(projection_matrix_, iBrother.projection_matrix_, 16 * sizeof(double));
 }
+#endif
 
 void NodeCamera::accept(SceneVisitor& v)
 {

Modified: branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c	2013-04-04 09:59:06 UTC (rev 55775)
+++ branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c	2013-04-04 11:47:48 UTC (rev 55776)
@@ -3301,8 +3301,6 @@
 	int recalc_normals = 0;	/* false by default */
 	int negative_scale;
 #ifdef WITH_FREESTYLE
-	const int *index_mf_to_mpoly = NULL;
-	const int *index_mp_to_orig = NULL;
 	FreestyleFace *ffa;
 #endif