diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-04 22:17:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-04 22:19:49 +0300 |
| commit | e59bd19fa75e65b794e4c67bdcfb8d13867900f9 (patch) | |
| tree | d8a97959c280bb97a5b916e8c47cc7457179fd14 /source/blender/editors/screen | |
| parent | 7478eb9bd09965f7d27064b500c91322f4fe3f14 (diff) | |
Cleanup: style & const's
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_context.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index a0ab8de0101..3a4034d9074 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -2069,7 +2069,7 @@ void ED_region_info_draw(ARegion *ar, const char *text, int block, float fill_co #define MAX_METADATA_STR 1024 -const char *meta_data_list[] = +static const char *meta_data_list[] = { "File", "Strip", diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 3431ce9f50a..fc4ee47b568 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -81,7 +81,6 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult ScrArea *sa = CTX_wm_area(C); Scene *scene = sc->scene; Base *base; - unsigned int lay = scene->lay; #if 0 /* Using the context breaks adding objects in the UI. Need to find out why - campbell */ Object *obact = CTX_data_active_object(C); @@ -119,7 +118,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult int selectable_objects = CTX_data_equals(member, "selectable_objects"); for (base = scene->base.first; base; base = base->next) { - if (base->lay & lay) { + if (base->lay & scene->lay) { if ((base->object->restrictflag & OB_RESTRICT_VIEW) == 0 && (base->object->restrictflag & OB_RESTRICT_SELECT) == 0) { if (selectable_objects) CTX_data_id_list_add(result, &base->object->id); |