Blender Git Loki

Merge branch 'blender2.8' into greasepencil-object

# Conflicts:
# source/blender/blenloader/intern/versioning_280.c
# source/blender/makesrna/intern/rna_scene.c

Cleanup: Whitespace + Code Redundancy

Merge branch 'blender2.8' into greasepencil-object

Tempting fate by merging in the Game Engine removal in here too...
We might as well do this now though, since it'll have to happen at
some time anyway!

# Conflicts:
# release/scripts/startup/bl_ui/properties_scene.py
# source/blender/blenkernel/intern/object.c
# source/blender/blenloader/intern/versioning_280.c
# source/blender/gpu/CMakeLists.txt
# source/blenderplayer/bad_level_call_stubs/stubs.c

Fix: Putting back bakeModifierGP() for Lattice and Hook

Ideally, we'd run this on a depsgraph-copy, on a background thread. But, that's
that's something that we'd be passing through to the modifier bake callbacks.

MOAR compile fixes for GP branch after merge

Lots more fixes for various little things that broke after the merge and the
fixes required for that.

Unfortunately, I've had to disable a few things to get Blender compiling
again - those will require a bit more attention to fix.

Things currently broken/disabled:
* Apply/Bake for Hook and Lattice modifiers - disabled as we need to rethink how
this works after EvaluationContext removal. Probably should go to a new depsgraph
copy (instead of working in main depsgraph).

* Helplines for GP point edit - 1c9690e7607bc990cc4a3e6ba839949bb83a78af has been
temporarily reverted due to conflicts with multiedit changes

Merge branch 'blender2.8' into greasepencil-object

Note:
There were some additional changes needed due to the EvaluationContext -> Depsgraph
cleanups + MultiObject edit that happened in 2.8 since the last merge of 2.8 into
this branch.


# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/blenkernel/BKE_modifier.h
# source/blender/editors/gpencil/gpencil_paint.c
# source/blender/editors/include/ED_object.h
# source/blender/editors/object/object_modifier.c
# source/blender/editors/screen/screen_context.c
# source/blender/editors/space_view3d/view3d_draw_legacy.c
# source/blender/editors/transform/transform.c
# source/blender/editors/transform/transform_conversions.c
# source/blender/editors/transform/transform_generics.c
# source/blender/editors/undo/ed_undo.c
# source/tools

Cleanup: Various code/style tweaks to GP code

Compiler warning fixes on GCC

* gpencil_add_*_shgroup() - Removed unused parameters (gpd)

* Fix warning about rgba being uninitialised in gpencil_fill.c::get_pixel()
- The non-float case here looks like it shouldn't ever happen, but for good measure,
I've added an assert + set a value here to keep compiler happy.

* Fix uninitialised var in gp_brush_drawcursor() - paintbrush

* GPencilOffsetModifier defined an RNA vertex group name set function, but didn't use it

Cleanup: various warnings

Now compiles w/o warnings for GCC

Fix invalid brush assignments

Cleanup: unused variables & args

Cleanup: -Wparentheses & line length

UI Tweak: Rename "Grease Pencil" menu in 3D View to "Strokes"

Menu names in general should be a single word. Having two separate words makes it
visually confusing (i.e. it looked like there were 4 menu items, when in fact there
were only 3). Since the operators here operate on the GP strokes, it's reasonable
to use this term instead.

(Discussed with William as part of an informal UI review of GP branch)

Fix compile error: Was missing 'const' qualifier

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Fix compiler error in Windows

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/blenkernel/intern/object.c

Fix parameter list errors after merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/blenloader/intern/readfile.c