From 5f6e47e76772760d4d5ddc729107ea7c29a17b1b Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 9 Oct 2014 17:12:32 +0200 Subject: Minor cleanup. * Use pie direction, not draw type for pie item collision * Strict function definitions. * Initialize random array with system time --- source/blender/blenlib/intern/rand.c | 2 +- source/blender/editors/interface/interface_handlers.c | 2 +- source/blender/render/intern/source/render_texture.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blender/blenlib/intern/rand.c b/source/blender/blenlib/intern/rand.c index 70780f9d47d..59ccf381f29 100644 --- a/source/blender/blenlib/intern/rand.c +++ b/source/blender/blenlib/intern/rand.c @@ -255,7 +255,7 @@ RNG_THREAD_ARRAY *BLI_rng_threaded_new(void) RNG_THREAD_ARRAY *rngarr = MEM_mallocN(sizeof(RNG_THREAD_ARRAY), "random_array"); for (i = 0; i < BLENDER_MAX_THREADS; i++) { - BLI_rng_srandom(&rngarr->rng_tab[i], (unsigned int)(rngarr->rng_tab[i].X * 257)); + BLI_rng_srandom(&rngarr->rng_tab[i], (unsigned int)clock()); } return rngarr; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 9138ac92ab9..2af034cde4d 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6560,7 +6560,7 @@ static bool ui_mouse_inside_button(ARegion *ar, uiBut *but, int x, int y) ui_window_to_block_fl(ar, block, &mx, &my); - if (but->dt == UI_EMBOSSR) { + if (but->pie_dir != UI_RADIAL_NONE) { if (!ui_but_isect_pie_seg(block, but)) { return false; } diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index f7e2fd573f4..d9d1acf4efe 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -88,12 +88,12 @@ extern struct Render R; static RNG_THREAD_ARRAY *random_tex_array; -void RE_init_texture_rng() +void RE_init_texture_rng(void) { random_tex_array = BLI_rng_threaded_new(); } -void RE_exit_texture_rng() +void RE_exit_texture_rng(void) { BLI_rng_threaded_free(random_tex_array); } -- cgit v1.2.3