Blender Git Commits

UI: Move some panels to toolbar

Add new context modes for grease pencil

These modes were missing.

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/properties_scene.py
source/blender/makesrna/intern/rna_object.c

Cleanup inactive code

Merge branch 'blender2.8' into greasepencil-object

Rework in modifers apply parameters

Instead to pass the Context variable that it was used to get bmain pointer,now bmain is passed as parameter to reduce data and avoid any use of Context.

Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object

Remove context parameter

This parameter is removed because Context must be avoided.

Redo mode settings after merge

This code section was changed in the last merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_ops.c

Cleanup: shadowed var

Modify mode set routine to enable grease pencil modes

Now, when you press the numeric key to change mode, if the object is grease pencil, the grease pencil mode is enabled.

Remove keymap for changing brush using numbers

This brush selection wil be replaced with spacebar and a menu.

Remove old mode switching Keymaps

These keymaps are conflicted with new mode switching keymaps.

Disable old mode switching code

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/addons
release/scripts/addons_contrib
source/blender/editors/object/object_edit.c

Fix parameter list for some functions after merge

Merge branch 'blender2.8' into greasepencil-object

Filter dopesheet channel to OB_GPENCIL only

This filter using ob->data is evaluated for any object type and this can produce problems.

In the future, when grease pencil dopesheet will be merge with "normal" dopesheet, this section must be recoded.

Cleanup: Rename depsgraph variable