diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-19 21:14:14 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:05 +0300 |
| commit | 4ff68d031d3a22e13125f3eadaf18808da52a99a (patch) | |
| tree | caa83ed93f1099f872c961a1ee8a06d33baa5b77 /source/blender/blenkernel/intern/effect.c | |
| parent | a351e8b6ef81f07b400cf2b7389f8ac1c7bb7e6b (diff) | |
Fix for warnings/errors
Conflicts:
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/particle_system.c
source/blender/makesrna/intern/rna_particle.c
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 82c3ed847a9..c18726e5905 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -1034,7 +1034,7 @@ static unsigned int debug_element_hash(const void *key) return elem->hash; } -static int debug_element_compare(const void *a, const void *b) +static bool debug_element_compare(const void *a, const void *b) { const SimDebugElement *elem1 = a; const SimDebugElement *elem2 = b; |