diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-04-29 21:04:18 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-29 21:10:34 +0300 |
commit | ac163447f86f95ec6136991d7df3aaaefdd55fae (patch) | |
tree | 883c34732ccd29fd9ade99aa98bca6d5fb43d966 /source/blender/makesrna/intern | |
parent | 461604c0d5ea58bb44a2fac0a3637f5b959aac26 (diff) |
Cleanup: warnings. spelling
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index b425a454d33..a09853eaddc 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -333,7 +333,7 @@ static void rna_Actuator_constraint_detect_material_set(struct PointerRNA *ptr, bActuator *act = (bActuator *)ptr->data; bConstraintActuator *ca = act->data; - short old_value = (ca->flag & ACT_CONST_MATERIAL ? 1 : 0); + short old_value = (ca->flag & ACT_CONST_MATERIAL) ? 1 : 0; if (old_value != value) { ca->flag ^= ACT_CONST_MATERIAL; diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 99b65b92f70..9ebef9db454 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -301,7 +301,7 @@ static void rna_Object_select_update(Main *UNUSED(bmain), Scene *scene, PointerR { if (scene) { Object *ob = (Object *)ptr->id.data; - short mode = ob->flag & SELECT ? BA_SELECT : BA_DESELECT; + short mode = (ob->flag & SELECT) ? BA_SELECT : BA_DESELECT; ED_base_object_select(BKE_scene_base_find(scene, ob), mode); } } @@ -309,7 +309,7 @@ static void rna_Object_select_update(Main *UNUSED(bmain), Scene *scene, PointerR static void rna_Base_select_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { Base *base = (Base *)ptr->data; - short mode = base->flag & BA_SELECT ? BA_SELECT : BA_DESELECT; + short mode = (base->flag & BA_SELECT) ? BA_SELECT : BA_DESELECT; ED_base_object_select(base, mode); } @@ -1134,7 +1134,7 @@ static void rna_GameObjectSettings_state_get(PointerRNA *ptr, int *values) { Object *ob = (Object *)ptr->data; int i; - int all_states = (ob->scaflag & OB_ALLSTATE ? 1 : 0); + int all_states = (ob->scaflag & OB_ALLSTATE) ? 1 : 0; memset(values, 0, sizeof(int) * OB_MAX_STATES); for (i = 0; i < OB_MAX_STATES; i++) { |