diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-03-02 17:03:02 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-03-02 19:09:24 +0300 |
| commit | aa845eed1e18fae45be8828bb08459c009dba6d5 (patch) | |
| tree | 19655cc2de5cf2e722e4e5e598c33d5bc3b2e041 /source/blender/makesrna | |
| parent | 561d11c5e601cce73dc6ab108596147bdfd4507c (diff) | |
Remove tons of OBACT
There are now only referenced in:
* drawobject.c
* particle_edit.c
* space_image.c (a single case to be handled on workspace branch)
* rigidbody_constraint.c (to be handled in the following commit)
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 9805f933487..cb57893e5b9 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -255,6 +255,7 @@ EnumPropertyItem rna_enum_file_sort_items[] = { #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_depsgraph.h" +#include "BKE_layer.h" #include "BKE_nla.h" #include "BKE_paint.h" #include "BKE_scene.h" @@ -817,7 +818,11 @@ static int rna_SpaceImageEditor_show_maskedit_get(PointerRNA *ptr) { SpaceImage *sima = (SpaceImage *)(ptr->data); bScreen *sc = (bScreen *)ptr->id.data; - return ED_space_image_check_show_maskedit(sc->scene, sima); + + TODO_LAYER_CONTEXT; /* get SceneLayer from context/window/workspace instead */ + SceneLayer *sl = BKE_scene_layer_context_active(sc->scene); + + return ED_space_image_check_show_maskedit(sl, sima); } static void rna_SpaceImageEditor_image_set(PointerRNA *ptr, PointerRNA value) |