diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2019-04-24 07:49:05 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2019-04-30 22:48:07 +0300 |
commit | 2d32372c59a03ca17a5d3edd11cc38f83b107033 (patch) | |
tree | 1c9459309c8f45eabdd0deed62df0d819304d991 | |
parent | 088d59c3d379f1a53fd2ee20a4bd569a70bbbd96 (diff) |
Remove BKE_scene_object_base_flag_sync_from_object
Note the fix for T62865 is still working fine.
-rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 13 | ||||
-rw-r--r-- | source/blender/editors/object/object_add.c | 1 |
4 files changed, 3 insertions, 17 deletions
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 6cd71604561..75ff5eace3c 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -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); diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 3cb4462aaf2..fc349e62809 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -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; } diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index d3c878918e3..895c21ba9f1 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -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; diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 638261ea69f..f8a13579732 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -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) { |