archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Farewell Scene->base

Browse Source 
While getting rid of Scene->base we got the following fixes:

* Fix "Convert To" operator
* Fix "NLA allowing to selected objects that are not selectable
* Fix scene.objects (readonly, no option to link/unlink)

Note: Collada needs to use the context SceneLayer for adding objects
however I added a placeholder, so Collada maintainers can fix this
properly.
This commit is contained in:
Dalai Felinto
2017-11-08 12:16:49 -02:00
parent 670e6cab43
commit 206c94fea9
41 changed files with 230 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/collada/collada_utils.cpp
View File

@@ -47,6 +47,7 @@ extern "C" {
#include "BKE_customdata.h"
#include "BKE_object.h"
#include "BKE_global.h"
#include "BKE_layer.h"
#include "BKE_mesh.h"
#include "BKE_scene.h"
#include "BKE_DerivedMesh.h"
@@ -142,7 +143,14 @@ Object *bc_add_object(Scene *scene, int type, const char *name)
ob->lay = scene->lay;
DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
BKE_scene_base_select(scene, BKE_scene_base_add(scene, ob));
/* XXX Collada should use the context scene layer, not the scene one. (dfelinto/gaia). */
SceneLayer *scene_layer = BKE_scene_layer_context_active_PLACEHOLDER(scene);
LayerCollection *layer_collection = BKE_layer_collection_get_active_ensure(scene, scene_layer);
BKE_collection_object_add(scene, layer_collection->scene_collection, ob);
Base *base = BKE_scene_layer_base_find(scene_layer, ob);
BKE_scene_layer_base_select(scene_layer, base);
return ob;
}