quiet warnings (building with -Werror)
authorCampbell Barton <ideasman42@gmail.com>
Thu, 4 Apr 2013 11:47:48 +0000 (11:47 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 4 Apr 2013 11:47:48 +0000 (11:47 +0000)
source/blender/blenkernel/intern/bpath.c
source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
source/blender/render/intern/source/convertblender.c

index 852dcc6216cb39062d532c9d874da4ee61107fc6..806b944572f9c4883d94e4a961b0532e3a701fcf 100644 (file)
@@ -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) {
-                                       FreestyleModuleConfigmodule = 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:
index df3afc8dc3f67a00467a31487ebfc1af93681b4b..c30252ada5ee2c3782f40a67da6c303ffa7f23de 100644 (file)
@@ -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)
 {
index 4369a6b02c6b92b28e12fa602784b4d2e5c54f2f..31d1fb93477c4d7edf2dfada785196e2af193a63 100644 (file)
@@ -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