diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-04-27 20:22:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-27 21:05:37 +0400 |
| commit | c3d3ae3ee7549de94121bee52b9604b142a7f27f (patch) | |
| tree | 28b30bd3fc650d3959b98ddcc5ee70d62435c47f /source | |
| parent | f0ec202099aa473778497f810ff6cb804511c77d (diff) | |
Code cleanup: avoid warning about bit-shift outside int range
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/fluidsim.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/armature/armature_select.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_armature.h | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 1f5ad4f0253..84bf9802304 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -41,7 +41,7 @@ #include "DNA_meshdata_types.h" #include "DNA_armature_types.h" #include "DNA_object_types.h" -#include "DNA_scene_types.h" // N_T +#include "DNA_scene_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index efc9869c5ca..beb85b31847 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -44,7 +44,7 @@ #include "DNA_object_force.h" // for pointcache #include "DNA_object_types.h" #include "DNA_particle_types.h" -#include "DNA_scene_types.h" // N_T +#include "DNA_scene_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index e420e56fdb0..9c3c93e4850 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -80,13 +80,15 @@ void *get_bone_from_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, EditBone *ebone; void *firstunSel = NULL, *firstSel = NULL, *data; unsigned int hitresult; - short i, takeNext = 0, sel; + short i; + bool takeNext = false; for (i = 0; i < hits; i++) { hitresult = buffer[3 + (i * 4)]; - if (!(hitresult & BONESEL_NOSEL)) { // -1 - if (hitresult & BONESEL_ANY) { // to avoid including objects in selection + if (!(hitresult & BONESEL_NOSEL)) { + if (hitresult & BONESEL_ANY) { /* to avoid including objects in selection */ + bool sel; hitresult &= ~(BONESEL_ANY); /* Determine what the current bone is */ @@ -305,7 +307,7 @@ static EditBone *get_nearest_editbonepoint(ViewContext *vc, const int mval[2], if (hits > 0) { if (hits == 1) { - if (!(buffer[3] & BONESEL_NOSEL)) + if (!(buffer[3] & BONESEL_NOSEL)) besthitresult = buffer[3]; } else { diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 4cf2257f6a1..be2c7daac85 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -90,7 +90,7 @@ typedef struct EditBone { #define BONESEL_BONE (1 << 30) #define BONESEL_ANY (BONESEL_TIP | BONESEL_ROOT | BONESEL_BONE) -#define BONESEL_NOSEL (1 << 31) /* Indicates a negative number */ +#define BONESEL_NOSEL (1u << 31u) /* useful macros */ #define EBONE_VISIBLE(arm, ebone) ( \ |