diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-08 17:16:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-08 23:39:01 +0300 |
| commit | 206c94fea98d44ed9667607638c455c7c0e63822 (patch) | |
| tree | ddc1f6f30c18d10674daaeeaee6b465550447709 /source/blender/editors/include | |
| parent | 670e6cab4319b94c96c6a61cb76199f1054b935a (diff) | |
Farewell Scene->base
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.
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 8 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_screen.h | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 5e3c91e15ab..19c1588fe7e 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -83,6 +83,12 @@ typedef enum eParentType { PAR_VERTEX_TRI, } eParentType; +typedef enum eObjectSelect_Mode{ + BA_DESELECT = 0, + BA_SELECT = 1, + BA_INVERT = 2, +} eObjectSelect_Mode; + #ifdef __RNA_TYPES_H__ extern struct EnumPropertyItem prop_clear_parent_types[]; extern struct EnumPropertyItem prop_make_parent_types[]; @@ -104,7 +110,7 @@ void ED_base_object_select(struct BaseLegacy *base, short mode); /* includes notifier */ void ED_base_object_activate(struct bContext *C, struct BaseLegacy *base); -void ED_object_base_select(struct Base *base, short mode); +void ED_object_base_select(struct Base *base, eObjectSelect_Mode mode); void ED_object_base_activate(struct bContext *C, struct Base *base); void ED_base_object_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Object *ob); diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index 8a1c7239955..f7219ce6846 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -49,6 +49,7 @@ struct WorkSpace; struct WorkSpaceInstanceHook; struct bContext; struct Scene; +struct SceneLayer; struct bScreen; struct ARegion; struct uiBlock; @@ -113,7 +114,10 @@ void ED_screen_draw(struct wmWindow *win); void ED_screen_refresh(struct wmWindowManager *wm, struct wmWindow *win); void ED_screen_do_listen(struct bContext *C, struct wmNotifier *note); bool ED_screen_change(struct bContext *C, struct bScreen *sc); -void ED_screen_update_after_scene_change(const struct bScreen *screen, struct Scene *scene_new); +void ED_screen_update_after_scene_change( + const struct bScreen *screen, + struct Scene *scene_new, + struct SceneLayer *scene_layer); void ED_screen_set_subwinactive(struct bContext *C, const struct wmEvent *event); void ED_screen_exit(struct bContext *C, struct wmWindow *window, struct bScreen *screen); void ED_screen_animation_timer(struct bContext *C, int redraws, int refresh, int sync, int enable); |