[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33720] branches/soc-2008-mxcurioni/source /blender: Fix for compilation errors with CMake on Linux.

[Tamito Kajiyama]

Revision: 33720
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33720
Author:   kjym3
Date:     2010-12-16 22:11:39 +0100 (Thu, 16 Dec 2010)

Log Message:
-----------
Fix for compilation errors with CMake on Linux.  Patch provided by
?\195?\137crivain through the BA Freestyle thread.  Thanks!

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h

Modified: branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c	2010-12-16 19:26:54 UTC (rev 33719)
+++ branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c	2010-12-16 21:11:39 UTC (rev 33720)
@@ -736,7 +736,7 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static int freestyle_module_add_exec(bContext *C, wmOperator *op)
+static int freestyle_module_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene= CTX_data_scene(C);
 	SceneRenderLayer *srl = (SceneRenderLayer*) BLI_findlink(&scene->r.layers, scene->r.actlay);
@@ -762,7 +762,7 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static int freestyle_module_remove_exec(bContext *C, wmOperator *op)
+static int freestyle_module_remove_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene= CTX_data_scene(C);
 	SceneRenderLayer *srl = (SceneRenderLayer*) BLI_findlink(&scene->r.layers, scene->r.actlay);
@@ -831,7 +831,7 @@
 	RNA_def_enum(ot->srna, "direction", direction_items, 0, "Direction", "Direction to move, UP or DOWN");
 }
 
-static int freestyle_lineset_add_exec(bContext *C, wmOperator *op)
+static int freestyle_lineset_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene= CTX_data_scene(C);
 	SceneRenderLayer *srl = (SceneRenderLayer*) BLI_findlink(&scene->r.layers, scene->r.actlay);
@@ -865,7 +865,7 @@
 	return FRS_get_active_lineset(&srl->freestyleConfig) != NULL;
 }
 
-static int freestyle_lineset_remove_exec(bContext *C, wmOperator *op)
+static int freestyle_lineset_remove_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene= CTX_data_scene(C);
 	SceneRenderLayer *srl = (SceneRenderLayer*) BLI_findlink(&scene->r.layers, scene->r.actlay);
@@ -1082,7 +1082,7 @@
 	ot->prop= RNA_def_enum(ot->srna, "type", linestyle_thickness_modifier_type_items, 0, "Type", "");
 }
 
-static int freestyle_modifier_toggle_fold_exec(bContext *C, wmOperator *op)
+static int freestyle_modifier_toggle_fold_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene= CTX_data_scene(C);
 	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier);

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h	2010-12-16 19:26:54 UTC (rev 33719)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h	2010-12-16 21:11:39 UTC (rev 33720)
@@ -41,6 +41,8 @@
 	#include "BKE_context.h"
 	#include "BKE_object.h"
 	
+	struct Render;
+	
 	extern Scene *freestyle_scene;
 	extern float freestyle_viewpoint[3];
 	extern float freestyle_mv[4][4];
@@ -48,14 +50,14 @@
 	extern int freestyle_viewport[4];
 
 	// Rendering
-	void FRS_initialize();
+	void FRS_initialize(void);
 	void FRS_set_context(bContext* C);
 	int FRS_is_freestyle_enabled(struct SceneRenderLayer* srl);
 	void FRS_init_stroke_rendering(struct Render* re);
 	struct Render* FRS_do_stroke_rendering(struct Render* re, struct SceneRenderLayer* srl);
 	void FRS_finish_stroke_rendering(struct Render* re);
 	void FRS_composite_result(struct Render* re, struct SceneRenderLayer* srl, struct Render* freestyle_render);
-	void FRS_exit();
+	void FRS_exit(void);
 	
 	// Panel configuration
 	void FRS_add_module(FreestyleConfig *config);