diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-18 06:13:36 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-18 06:13:36 +0400 |
| commit | 68715c5ca7c148f511ac1a8136e7590602895947 (patch) | |
| tree | ddaf2b0eb4035e799bbc2e43ec5f1f13309e8387 /source/blender/freestyle/intern/blender_interface | |
| parent | 94ae0232b0337ab70cecaef03cd845887cd36eaa (diff) | |
A patch set from Bastien Montagne (thanks!) for silencing build warnings (from gcc 4.7),
mostly by commenting out unused variables, or using the BLI's SET_UINT_IN_POINTER macro.
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface')
3 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 11124b60b06..e9586e347a2 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -106,7 +106,7 @@ NodeGroup* BlenderFileLoader::Load() int BlenderFileLoader::countClippedFaces(float v1[3], float v2[3], float v3[3], int clip[3]) { float *v[3]; - int numClipped, sum, numTris; + int numClipped, sum, numTris = 0; v[0] = v1; v[1] = v2; @@ -356,7 +356,7 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) // We parse vlak nodes and count the number of faces after the clipping by // the near and far view planes is applied (Note: mesh vertices are in the // camera coordinate system). - VlakRen *vlr; + VlakRen *vlr = NULL; unsigned numFaces = 0; float v1[3], v2[3], v3[3], v4[3]; float n1[3], n2[3], n3[3], n4[3], facenormal[3]; diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index f80761c3cc7..ca4cbd35edc 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -117,6 +117,10 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re, int render_count) : Str freestyle_scene->r.im_format.imtype = R_IMF_IMTYPE_PNG; BKE_scene_disable_color_management(freestyle_scene); + if (G.debug & G_DEBUG_FREESTYLE) { + printf("%s: %d threads\n", __func__, freestyle_scene->r.threads); + } + // Render layer SceneRenderLayer *srl = (SceneRenderLayer *)freestyle_scene->r.layers.first; srl->layflag = SCE_LAY_SOLID | SCE_LAY_ZTRA; @@ -221,7 +225,7 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const vector<Strip*>& strips = iStrokeRep->getStrips(); Strip::vertex_container::iterator v[3]; StrokeVertexRep *svRep[3]; - Vec3r color[3]; + /* Vec3r color[3]; */ /* UNUSED */ unsigned int vertex_index, edge_index, loop_index; Vec2r p; @@ -481,6 +485,8 @@ Object *BlenderStrokeRenderer::NewMesh() const #if 0 BKE_scene_base_deselect_all(scene); BKE_scene_base_select(scene, base); +#else + (void)base; #endif ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME; diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h index d1c82e7a3b4..89bb20b4bed 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __BLENDERSTROKERENDERER_H__ -#define __BLENDERSTROKERENDERER_H__ +#ifndef __BLENDER_STROKE_RENDERER_H__ +#define __BLENDER_STROKE_RENDERER_H__ /** \file blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h * \ingroup freestyle @@ -73,4 +73,4 @@ protected: float get_stroke_vertex_z(void) const; }; -#endif // __BLENDERSTROKERENDERER_H__ +#endif // __BLENDER_STROKE_RENDERER_H__ |