diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-04-04 22:39:57 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-04-04 22:39:57 +0300 |
| commit | 7576ad3d043ac5d15e0c5a68e65339904441b5e7 (patch) | |
| tree | bb990cce1eec04d45ab57e8a42af2669f9d7522f /source/blender/editors/screen/screen_context.c | |
| parent | 10b24eabbab0193f6944cdf3bec7b386c75d5445 (diff) | |
| parent | db0f67f46454fd0bfeb886d3e61227b65fbc6ac1 (diff) | |
Merge branch 'blender2.8' into transform-manipulatorstransform-manipulators
Conflicts:
intern/gawain/gawain/immediate.h
intern/gawain/src/immediate.c
source/blender/editors/physics/physics_ops.c
source/blender/editors/screen/glutil.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/transform/transform_manipulator.c
Diffstat (limited to 'source/blender/editors/screen/screen_context.c')
| -rw-r--r-- | source/blender/editors/screen/screen_context.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index c82a210725c..0448fba78e6 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -97,7 +97,6 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } else if (CTX_data_equals(member, "visible_objects")) { - Object *ob; FOREACH_VISIBLE_OBJECT(sl, ob) { CTX_data_id_list_add(result, &ob->id); @@ -116,7 +115,6 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } else if (CTX_data_equals(member, "selected_objects")) { - Object *ob; FOREACH_SELECTED_OBJECT(sl, ob) { CTX_data_id_list_add(result, &ob->id); @@ -126,7 +124,6 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } else if (CTX_data_equals(member, "selected_editable_objects")) { - Object *ob; FOREACH_SELECTED_OBJECT(sl, ob) { if (0 == BKE_object_is_libdata(ob)) { @@ -139,7 +136,6 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } else if (CTX_data_equals(member, "editable_objects")) { /* Visible + Editable, but not necessarily selected */ - Object *ob; FOREACH_VISIBLE_OBJECT(sl, ob) { if (0 == BKE_object_is_libdata(ob)) { @@ -151,7 +147,6 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } else if ( CTX_data_equals(member, "visible_bases")) { - Base *base; FOREACH_VISIBLE_BASE(sl, base) { CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base); |