diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-04 06:05:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-04 06:05:11 +0400 |
commit | 7bbaf4853ae81344761fceac90b08785520c18d0 (patch) | |
tree | fdfb403a573188312e43bf134a13c9a2e0d36e7e /source/blender/blenkernel/intern | |
parent | 47fffc86bc94318aa34f50c035c99cfe8c7bad42 (diff) |
code cleanup: use bools in UI and WM code, quiet some shadow warnings, remove unused function uiEmboss()
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/anim.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 9c472ed64c6..8c49ce22dea 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -1092,7 +1092,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa /* get derived mesh */ dm_mask = CD_MASK_BAREMESH; if (flag & DUPLILIST_FOR_RENDER) - dm_mask |= CD_MASK_ORCO|CD_MASK_MLOOPUV; + dm_mask |= CD_MASK_ORCO | CD_MASK_MLOOPUV; if (em) { dm = editbmesh_get_derived_cage(scene, par, em, dm_mask); diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 08c3796b47b..8cee97ee930 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1050,6 +1050,7 @@ ID *BKE_libblock_find_name(const short type, const char *name) /* type: "OB return BLI_findstring(lb, name, offsetof(ID, name) + 2); } +#if 0 /* UNUSED */ static void get_flags_for_id(ID *id, char *buf) { int isfake = id->flag & LIB_FAKEUSER; @@ -1130,7 +1131,6 @@ static void IDnames_to_dyn_pupstring(DynStr *pupds, ListBase *lb, ID *link, shor } } -#if 0 /* unused */ /* used by headerbuttons.c buttons.c editobject.c editseq.c */ /* if (nr == NULL) no MAX_IDPUP, this for non-header browsing */ void IDnames_to_pupstring(const char **str, const char *title, const char *extraops, ListBase *lb, ID *link, short *nr) |