diff options
Diffstat (limited to 'source/blender/render')
7 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index e741c622380..e70287e522e 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -321,7 +321,7 @@ u | | F1 | F2 | /* ------------------------------------------------------------------------- */ -static void split_v_renderfaces(ObjectRen *obr, int startvlak, int startvert, int usize, int vsize, int uIndex, int cyclu, int cyclv) +static void split_v_renderfaces(ObjectRen *obr, int startvlak, int startvert, int usize, int vsize, int uIndex, int UNUSED(cyclu), int cyclv) { int vLen = vsize-1+(!!cyclv); int v; diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index 8977bc7f379..f7da13373d1 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -86,7 +86,7 @@ static void envmap_split_ima(EnvMap *env, ImBuf *ibuf) if (env->type == ENV_CUBE) { for(part=0; part<6; part++) { - env->cube[part]= IMB_allocImBuf(dx, dx, 24, IB_rect|IB_rectfloat, 0); + env->cube[part]= IMB_allocImBuf(dx, dx, 24, IB_rect|IB_rectfloat); } IMB_float_from_rect(ibuf); @@ -458,7 +458,7 @@ static void render_envmap(Render *re, EnvMap *env) int y; float *alpha; - ibuf= IMB_allocImBuf(envre->rectx, envre->recty, 24, IB_rect|IB_rectfloat, 0); + ibuf= IMB_allocImBuf(envre->rectx, envre->recty, 24, IB_rect|IB_rectfloat); memcpy(ibuf->rect_float, rl->rectf, ibuf->channels * ibuf->x * ibuf->y * sizeof(float)); if (re->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 79f489137f3..ed390fe102a 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -122,20 +122,20 @@ Render R; static volatile int g_break= 0; -static int thread_break(void *unused) +static int thread_break(void *UNUSED(arg)) { return g_break; } /* default callbacks, set in each new render */ -static void result_nothing(void *unused, RenderResult *rr) {} -static void result_rcti_nothing(void *unused, RenderResult *rr, volatile struct rcti *rect) {} -static void stats_nothing(void *unused, RenderStats *rs) {} -static void float_nothing(void *unused, float val) {} -static void print_error(void *unused, char *str) {printf("ERROR: %s\n", str);} -static int default_break(void *unused) {return G.afbreek == 1;} +static void result_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr)) {} +static void result_rcti_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr), volatile struct rcti *UNUSED(rect)) {} +static void stats_nothing(void *UNUSED(arg), RenderStats *UNUSED(rs)) {} +static void float_nothing(void *UNUSED(arg), float UNUSED(val)) {} +static void print_error(void *UNUSED(arg), char *str) {printf("ERROR: %s\n", str);} +static int default_break(void *UNUSED(arg)) {return G.afbreek == 1;} -static void stats_background(void *unused, RenderStats *rs) +static void stats_background(void *UNUSED(arg), RenderStats *rs) { char str[400], *spos= str; uintptr_t mem_in_use, mmap_in_use, peak_memory; @@ -1398,7 +1398,7 @@ void RE_error_cb(Render *re, void *handle, void (*f)(void *handle, char *str)) /* object is considered fully prepared on correct time etc */ /* includes lights */ -void RE_AddObject(Render *re, Object *ob) +void RE_AddObject(Render *UNUSED(re), Object *UNUSED(ob)) { } @@ -2813,7 +2813,7 @@ static int do_write_image_or_movie(Render *re, Scene *scene, bMovieHandle *mh, R } } else { - ImBuf *ibuf= IMB_allocImBuf(rres.rectx, rres.recty, scene->r.planes, 0, 0); + ImBuf *ibuf= IMB_allocImBuf(rres.rectx, rres.recty, scene->r.planes, 0); /* if not exists, BKE_write_ibuf makes one */ ibuf->rect= (unsigned int *)rres.rect32; @@ -3170,7 +3170,7 @@ void RE_layer_load_from_file(RenderLayer *layer, ReportList *reports, char *file if(ibuf->rect_float==NULL) IMB_float_from_rect(ibuf); - ibuf_clip = IMB_allocImBuf(layer->rectx, layer->recty, 32, IB_rectfloat, 0); + ibuf_clip = IMB_allocImBuf(layer->rectx, layer->recty, 32, IB_rectfloat); if(ibuf_clip) { IMB_rectcpy(ibuf_clip, ibuf, 0,0, 0,0, layer->rectx, layer->recty); diff --git a/source/blender/render/intern/source/rayobject_instance.c b/source/blender/render/intern/source/rayobject_instance.c index 25765c4763a..a8098d2e8ef 100644 --- a/source/blender/render/intern/source/rayobject_instance.c +++ b/source/blender/render/intern/source/rayobject_instance.c @@ -41,7 +41,7 @@ static void RE_rayobject_instance_free(RayObject *o); static void RE_rayobject_instance_bb(RayObject *o, float *min, float *max); static float RE_rayobject_instance_cost(RayObject *o); -static void RE_rayobject_instance_hint_bb(RayObject *o, RayHint *hint, float *min, float *max) +static void RE_rayobject_instance_hint_bb(RayObject *UNUSED(o), RayHint *UNUSED(hint), float *UNUSED(min), float *UNUSED(max)) {} static RayObjectAPI instance_api = diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 7101ce5daaf..e589bb3a840 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -820,7 +820,7 @@ static void *do_shadow_thread(void *re_v) } static volatile int g_break= 0; -static int thread_break(void *unused) +static int thread_break(void *UNUSED(arg)) { return g_break; } diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c index e8c95a34ac4..1e8709d09f7 100644 --- a/source/blender/render/intern/source/sss.c +++ b/source/blender/render/intern/source/sss.c @@ -466,7 +466,7 @@ static void compute_radiance(ScatterTree *tree, float *co, float *rad) /* building */ -static void sum_leaf_radiance(ScatterTree *tree, ScatterNode *node) +static void sum_leaf_radiance(ScatterTree *UNUSED(tree), ScatterNode *node) { ScatterPoint *p; float rad, totrad= 0.0f, inv; @@ -540,7 +540,7 @@ static void sum_leaf_radiance(ScatterTree *tree, ScatterNode *node) } } -static void sum_branch_radiance(ScatterTree *tree, ScatterNode *node) +static void sum_branch_radiance(ScatterTree *UNUSED(tree), ScatterNode *node) { ScatterNode *subnode; float rad, totrad= 0.0f, inv; diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c index d3e8f4058c5..39e8315e7cf 100644 --- a/source/blender/render/intern/source/volume_precache.c +++ b/source/blender/render/intern/source/volume_precache.c @@ -89,7 +89,7 @@ int intersect_outside_volume(RayObject *tree, Isect *isect, float *offset, int l } /* Uses ray tracing to check if a point is inside or outside an ObjectInstanceRen */ -int point_inside_obi(RayObject *tree, ObjectInstanceRen *obi, float *co) +int point_inside_obi(RayObject *tree, ObjectInstanceRen *UNUSED(obi), float *co) { Isect isect; float vec[3] = {0.0f,0.0f,1.0f}; |