diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-01 15:10:29 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-01 17:35:21 +0300 |
commit | b00b9dadd819d3b94405f755131e609afa827438 (patch) | |
tree | ea73eb72a089799151299e32d861e60f1af94cb9 /source/blender/blenkernel | |
parent | c1f43c9dc654f5257790654f4b77c7e55c137a19 (diff) |
Outliner: Support dragging object into collection
Doing this will add the object to the collection.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 13 |
4 files changed, 18 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index d208cee5b4b..863f33dea8d 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -91,7 +91,7 @@ struct LayerCollection *BKE_collection_link(struct SceneLayer *sl, struct SceneC void BKE_collection_unlink(struct SceneLayer *sl, struct LayerCollection *lc); -bool BKE_scene_layer_has_collection(struct SceneLayer *sl, struct SceneCollection *sc); +bool BKE_scene_layer_has_collection(struct SceneLayer *sl, const struct SceneCollection *sc); bool BKE_scene_has_object(struct Scene *scene, struct Object *ob); /* syncing */ diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index bed643c2133..0e264c5a125 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -47,6 +47,7 @@ struct QuicktimeCodecData; struct RenderData; struct SceneRenderLayer; struct Scene; +struct SceneCollection; struct SceneLayer; struct UnitSettings; struct Main; @@ -111,6 +112,8 @@ void BKE_scene_groups_relink(struct Scene *sce); void BKE_scene_make_local(struct Main *bmain, struct Scene *sce, const bool lib_local); +struct Scene *BKE_scene_find_from_collection(const struct Main *bmain, const struct SceneCollection *scene_collection); + struct Object *BKE_scene_camera_find(struct Scene *sc); #ifdef DURIAN_CAMERA_SWITCH struct Object *BKE_scene_camera_switch_find(struct Scene *scene); // DURIAN_CAMERA_SWITCH diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index d5e3e211642..605705c483a 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -656,7 +656,7 @@ static LayerCollection *layer_collection_add(SceneLayer *sl, ListBase *lb, Scene /** * See if render layer has the scene collection linked directly, or indirectly (nested) */ -bool BKE_scene_layer_has_collection(struct SceneLayer *sl, struct SceneCollection *sc) +bool BKE_scene_layer_has_collection(SceneLayer *sl, const SceneCollection *sc) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { if (find_layer_collection_by_scene_collection(lc, sc) != NULL) { diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 8f3783bc4a3..4d01b1b2eb6 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1152,6 +1152,19 @@ int BKE_scene_base_iter_next(EvaluationContext *eval_ctx, SceneBaseIter *iter, return iter->phase; } +Scene *BKE_scene_find_from_collection(const Main *bmain, const SceneCollection *scene_collection) +{ + for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (SceneLayer *layer = scene->render_layers.first; layer; layer = layer->next) { + if (BKE_scene_layer_has_collection(layer, scene_collection)) { + return scene; + } + } + } + + return NULL; +} + Object *BKE_scene_camera_find(Scene *sc) { BaseLegacy *base; |