Blender Git Commits

Cleanup: Remove unused parameter

Cleanup: Remove unused variable

Use Brush material for Fill brush

Now the color used is the assigned to the brush and not the active color in material slots.

Fix compiler errors after merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/makesdna/DNA_scene_types.h

Use as Brush Material default slot 1

Use always the first material as default if the brush hasn't assigned a material.

Before, the current slot was used as default, but this could create a misunderstanding and make the artist believe he could select the color in properties.

Merge branch 'blender2.8' into greasepencil-object

Cleanup: Remove redundant function (and cleanup compiler warnings in the process)

BKE_gpencil_frame_color_duplicate() is no longer needed to perform Grease Pencil's
in-house "COW" operations. It was previously used to create a copy of the palette
datablock being used, and to then reassign all the color pointers. Now that that's
no longer needed, we can just use the standard one.

Note: BKE_gpencil_stroke_duplicate() has now been modified to NOT clear the triangles
array anymore. Instead, since most places that use this will clear/reallocate it
themselves, it's easier to just keep it there, making the COW stuff easier.

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/depsgraph/intern/builder/deg_builder_relations.cc

Cleanup: Fix code format broken by previous commit

Make color picker panel set Brush Material

When select a color in the panel, the color is assigned to the current Brush as its default material.

Use Brush material for drawing instead of Active slot

Instead to use the active material in the list of materials, now always use the material assigned to Brush.

If the brush hasn't a material assigned, then the current slot is assigned as the brush material and it will be used in the next drawings of this brush.

Fix: Only show GP add shapes panel when GP object is active

Fix print about removed properties

* show_only_render has been removed. Instead, this is now handled through the
overlays popovers. Therefore, we no longer need (or should have) a dedicated
button for this.

* Removed also the lock camera button. This shouldn't be here in the first place,
as it was a dedicated workflow-specific hack added for the Hero production workflow
only.

Cleanup: Remove the now unnecessary modifier_index parameter from Modifier->generateStrokes()

Merge branch 'blender2.8' into greasepencil-object

Fix compiler warnings after merge

* Adapted various DRW_* identifiers that got cleaned up in 2.8

* BKE_gpencil_frame_color_duplicate() - should be removed

* File versioning code for GP annotation datablocks - knock this out for now
(since it's causing compiling problems due to the view layer stuff being
deprecated). We need to review whether we do this type of patching automatically,
since we don't really want GP annotations to show up on Cycles renders for example.

Fix GP modifiers after merge (formatting/extra fields added to modifiers)

Merge branch 'blender2.8' into greasepencil-object

# Todo's / Need Further Review:
# - material.c - "man->gpcolor = NULL" (commented out for now)
# - rna_material.c - "rna_Material_update()" - Should GP material settings use their own update?
# - GP Modifiers typedefines need updating for the new struct layout
# - Merge conflicts in properties_gp_common.py - Mostly due to panels being removed in GP branch
# - GP Panels in 3D View (toolbar/topbar fixes postponed till after branch merge)
# - GP "Paper" Option/Settings (should become overlay? Design work needed)

# Conflicts:
# release/scripts/addons
# release/scripts/addons_contrib
# release/scripts/startup/bl_ui/properties_grease_pencil_common.py
# release/scripts/startup/bl_ui/space_view3d.py
# release/scripts/startup/bl_ui/space_view3d_toolbar.py
# source/blender/blenkernel/BKE_modifier.h
# source/blender/blenkernel/intern/material.c
# source/blender/editors/object/object_transform.c
# source/blender/editors/space_outliner/outliner_select.c
# source/blender/gpu/intern/gpu_shader.c
# source/blender/makesrna/intern/rna_material.c
# source/blender/modifiers/intern/MOD_armature.c
# source/blender/modifiers/intern/MOD_array.c
# source/blender/modifiers/intern/MOD_bevel.c
# source/blender/modifiers/intern/MOD_boolean.c
# source/blender/modifiers/intern/MOD_build.c
# source/blender/modifiers/intern/MOD_cast.c
# source/blender/modifiers/intern/MOD_cloth.c
# source/blender/modifiers/intern/MOD_collision.c
# source/blender/modifiers/intern/MOD_correctivesmooth.c
# source/blender/modifiers/intern/MOD_curve.c
# source/blender/modifiers/intern/MOD_datatransfer.c
# source/blender/modifiers/intern/MOD_decimate.c
# source/blender/modifiers/intern/MOD_displace.c
# source/blender/modifiers/intern/MOD_dynamicpaint.c
# source/blender/modifiers/intern/MOD_edgesplit.c
# source/blender/modifiers/intern/MOD_explode.c
# source/blender/modifiers/intern/MOD_fluidsim.c
# source/blender/modifiers/intern/MOD_hook.c
# source/blender/modifiers/intern/MOD_laplaciandeform.c
# source/blender/modifiers/intern/MOD_laplaciansmooth.c
# source/blender/modifiers/intern/MOD_lattice.c
# source/blender/modifiers/intern/MOD_mask.c
# source/blender/modifiers/intern/MOD_meshcache.c
# source/blender/modifiers/intern/MOD_meshdeform.c
# source/blender/modifiers/intern/MOD_meshsequencecache.c
# source/blender/modifiers/intern/MOD_mirror.c
# source/blender/modifiers/intern/MOD_multires.c
# source/blender/modifiers/intern/MOD_none.c
# source/blender/modifiers/intern/MOD_normal_edit.c
# source/blender/modifiers/intern/MOD_ocean.c
# source/blender/modifiers/intern/MOD_particleinstance.c
# source/blender/modifiers/intern/MOD_particlesystem.c
# source/blender/modifiers/intern/MOD_remesh.c
# source/blender/modifiers/intern/MOD_screw.c
# source/blender/modifiers/intern/MOD_shapekey.c
# source/blender/modifiers/intern/MOD_shrinkwrap.c
# source/blender/modifiers/intern/MOD_simpledeform.c
# source/blender/modifiers/intern/MOD_skin.c
# source/blender/modifiers/intern/MOD_smoke.c
# source/blender/modifiers/intern/MOD_smooth.c
# source/blender/modifiers/intern/MOD_softbody.c
# source/blender/modifiers/intern/MOD_solidify.c
# source/blender/modifiers/intern/MOD_subsurf.c
# source/blender/modifiers/intern/MOD_surface.c
# source/blender/modifiers/intern/MOD_surfacedeform.c
# source/blender/modifiers/intern/MOD_triangulate.c
# source/blender/modifiers/intern/MOD_uvproject.c
# source/blender/modifiers/intern/MOD_uvwarp.c
# source/blender/modifiers/intern/MOD_warp.c
# source/blender/modifiers/intern/MOD_wave.c
# source/blender/modifiers/intern/MOD_weightvgedit.c
# source/blender/modifiers/intern/MOD_weightvgmix.c
# source/blender/modifiers/intern/MOD_weightvgproximity.c
# source/blender/modifiers/intern/MOD_wireframe.c

Cleanup: Material Buttons for GP

* Don't collapse panels by default
* Cleanup old code/names/etc.