Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-10-09 19:12:32 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-10-09 19:12:32 +0400
commit5f6e47e76772760d4d5ddc729107ea7c29a17b1b (patch)
tree00e5df0b1ba8817325b59dded3623f85501e39de
parent928be3013aac4527be44eadd3d662b4b4f05053f (diff)
Minor cleanup.
* Use pie direction, not draw type for pie item collision * Strict function definitions. * Initialize random array with system time
-rw-r--r--source/blender/blenlib/intern/rand.c2
-rw-r--r--source/blender/editors/interface/interface_handlers.c2
-rw-r--r--source/blender/render/intern/source/render_texture.c4
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);
}