blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Remove BKE_scene_object_base_flag_sync_from_object 

Note the fix for T62865 is still working fine.
This commit is contained in:
Dalai Felinto 2019-04-24 01:49:05 -03:00
parent 088d59c3d3
commit 2d32372c59
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_scene.h
View File

@ -102,7 +102,6 @@ int BKE_scene_base_iter_next(struct Depsgraph *depsgraph,
void BKE_scene_base_flag_to_objects(struct ViewLayer *view_layer);
void BKE_scene_object_base_flag_sync_from_base(struct Base *base);
void BKE_scene_object_base_flag_sync_from_object(struct Base *base);
void BKE_scene_set_background(struct Main *bmain, struct Scene *sce);
struct Scene *BKE_scene_set_name(struct Main *bmain, const char *name);

5
source/blender/blenkernel/intern/layer.c
View File

@ -35,7 +35,6 @@
#include "BKE_main.h"
#include "BKE_node.h"
#include "BKE_object.h"
#include "BKE_scene.h"
#include "DNA_ID.h"
#include "DNA_space_types.h"
@ -91,7 +90,9 @@ static Base *object_base_new(Object *ob)
{
Base *base = MEM_callocN(sizeof(Base), "Object Base");
base->object = ob;
BKE_scene_object_base_flag_sync_from_object(base);
if (ob->base_flag & BASE_SELECTED) {
base->flag |= BASE_SELECTED;
}
return base;
}

13
source/blender/blenkernel/intern/scene.c
View File

@ -1765,19 +1765,6 @@ void BKE_scene_object_base_flag_sync_from_base(Base *base)
}
}
void BKE_scene_object_base_flag_sync_from_object(Base *base)
{
Object *ob = base->object;
base->flag = ob->flag;
if ((ob->flag & SELECT) != 0 && (base->flag & BASE_SELECTABLE) != 0) {
base->flag |= BASE_SELECTED;
}
else {
base->flag &= ~BASE_SELECTED;
}
}
void BKE_scene_disable_color_management(Scene *scene)
{
ColorManagedDisplaySettings *display_settings = &scene->display_settings;

1
source/blender/editors/object/object_add.c
View File

@ -2481,7 +2481,6 @@ static int add_named_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
BKE_scene_object_base_flag_sync_from_object(basen);
basen->object->restrictflag &= ~OB_RESTRICT_VIEW;
if (event) {