diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-02-09 16:49:07 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-02-09 16:49:56 +0300 |
| commit | 0b473168cd291615d81ad31ce8254a90ce4f2738 (patch) | |
| tree | 16a92a02a35a260386f71df53ace3a3ac66ea6ca /source/blender/makesdna | |
| parent | 8ff7f14c76df2cd2d214e3b5f8078a213a262a6b (diff) | |
Fix widget not showing up
(and more Scene.base > SceneLayer.object_bases changes in transforma code)
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 29d96b900a0..4cf4259d1de 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1989,10 +1989,17 @@ extern const char *RE_engine_id_CYCLES; (base->lay & (v3d ? v3d->lay : scene->lay)) && \ (base->object->restrictflag & OB_RESTRICT_VIEW) == 0) +#define TESTBASELIB_NEW(base) ( \ + ((base->flag & BASE_SELECTED) != 0) && \ + ((base)->object->id.lib == NULL) && \ + ((base->flag & BASE_VISIBLED) != 0)) #define TESTBASELIB_BGMODE_NEW(base) ( \ ((base->flag & BASE_SELECTED) != 0) && \ - ((base->object->id.lib == NULL) && \ - ((base->flag & BASE_VISIBLED) != 0))) + (base->object->id.lib == NULL) && \ + ((base->flag & BASE_VISIBLED) != 0)) +#define BASE_EDITABLE_BGMODE_NEW(base) ( \ + ((base)->object->id.lib == NULL) && \ + ((base->flag & BASE_VISIBLED) != 0)) #define BASE_SELECTABLE_NEW(base) \ ((base->flag & BASE_SELECTABLED) != 0) |