quiet warnings (building with -Werror)

3 files changed, 6 insertions, 3 deletions

diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c
index 852dcc6216c..806b944572f 100644
--- a/source/blender/blenkernel/intern/bpath.c
+++ b/source/blender/blenkernel/intern/bpath.c
@@ -580,16 +580,19 @@ void BKE_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int
 				}
 				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:
diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
index df3afc8dc3f..c30252ada5e 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
@@ -51,11 +51,13 @@ NodeCamera::NodeCamera(CameraType camera_type) : camera_type_(camera_type)
 	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)
 {
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 4369a6b02c6..31d1fb93477 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3301,8 +3301,6 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 	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