Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-08 20:19:12 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-08 20:50:44 +0300
commitae2af4692009fe2c3fc97783f6d69aaa7cac5123 (patch)
tree897af6264bd392b92712a4c2e5077be9384297af /source/blender/blenkernel/BKE_layer.h
parent54985ab5f569f4623695c693dedda7c000e1e73f (diff)
Fix inconsistent naming and behavior for base visible/selected/editable.
Fixes T60251.
Diffstat (limited to 'source/blender/blenkernel/BKE_layer.h')
-rw-r--r--source/blender/blenkernel/BKE_layer.h32
1 files changed, 0 insertions, 32 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 9ac0c56d93f..746733e4e0e 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -156,10 +156,6 @@ struct ObjectsInModeIteratorData {
struct Base *base_active;
};
-void BKE_view_layer_renderable_objects_iterator_begin(BLI_Iterator *iter, void *data_in);
-void BKE_view_layer_renderable_objects_iterator_next(BLI_Iterator *iter);
-void BKE_view_layer_renderable_objects_iterator_end(BLI_Iterator *iter);
-
void BKE_view_layer_bases_in_mode_iterator_begin(BLI_Iterator *iter, void *data_in);
void BKE_view_layer_bases_in_mode_iterator_next(BLI_Iterator *iter);
void BKE_view_layer_bases_in_mode_iterator_end(BLI_Iterator *iter);
@@ -320,34 +316,6 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
ITER_END; \
} ((void)0)
-struct ObjectsRenderableIteratorData {
- struct Scene *scene;
- struct Base base_temp;
- struct Scene scene_temp;
-
- struct {
- struct ViewLayer *view_layer;
- struct Base *base;
- struct Scene *set;
- } iter;
-};
-
-#define FOREACH_OBJECT_RENDERABLE_BEGIN(scene_, _instance) \
-{ \
- struct ObjectsRenderableIteratorData data_ = { \
- .scene = (scene_), \
- }; \
- ITER_BEGIN(BKE_view_layer_renderable_objects_iterator_begin, \
- BKE_view_layer_renderable_objects_iterator_next, \
- BKE_view_layer_renderable_objects_iterator_end, \
- &data_, Object *, _instance)
-
-
-#define FOREACH_OBJECT_RENDERABLE_END \
- ITER_END; \
-} ((void)0)
-
-
/* layer_utils.c */
struct ObjectsInModeParams {