diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-17 00:11:39 +0300 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-17 00:11:39 +0300 |
commit | c4e41d7371522b46fb14cf8d809d5e3d470a1457 (patch) | |
tree | 786e9b1548c484ca2f92f77d638a10978f07d526 /source | |
parent | 31897978338936c6d6149e0a64d93a52a30132bc (diff) |
Fix for compilation errors with CMake on Linux. Patch provided by
Écrivain through the BA Freestyle thread. Thanks!
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/render/render_shading.c | 10 | ||||
-rw-r--r-- | source/blender/freestyle/FRS_freestyle.h | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 60b08e2a5d5..bde4b56220e 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -736,7 +736,7 @@ void SCENE_OT_render_layer_remove(wmOperatorType *ot) 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 @@ void SCENE_OT_freestyle_module_add(wmOperatorType *ot) 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 @@ void SCENE_OT_freestyle_module_move(wmOperatorType *ot) 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 @@ static int freestyle_active_lineset_poll(bContext *C) 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 @@ void SCENE_OT_freestyle_thickness_modifier_add(wmOperatorType *ot) 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); diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index ae8adb86c1c..9a40fc3e019 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -41,6 +41,8 @@ extern "C" { #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 "C" { 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); |