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

7
source/blender/blenkernel/intern/blender_copybuffer.c
View File

@@ -45,6 +45,7 @@
#include "BKE_blendfile.h"
#include "BKE_context.h"
#include "BKE_global.h"
#include "BKE_layer.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_scene.h"
@@ -119,7 +120,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
SceneLayer *sl = CTX_data_scene_layer(C);
SceneLayer *scene_layer = CTX_data_scene_layer(C);
Main *mainl = NULL;
Library *lib;
BlendHandle *bh;
@@ -131,7 +132,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re
return false;
}
BKE_scene_base_deselect_all(scene);
BKE_scene_layer_base_deselect_all(scene_layer);
/* tag everything, all untagged data can be made local
* its also generally useful to know what is new
@@ -144,7 +145,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re
BLO_library_link_copypaste(mainl, bh);
BLO_library_link_end(mainl, &bh, flag, scene, sl);
BLO_library_link_end(mainl, &bh, flag, scene, scene_layer);
/* mark all library linked objects to be updated */
BKE_main_lib_objects_recalc_all(bmain);