Blender Git Loki

Merge branch 'master' into functions

Merge branch 'greasepencil-object' into greasepencil-refactor

Merge branch 'master' into greasepencil-object

Merge branch 'greasepencil-object' into greasepencil-refactor

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

Merge branch 'master' into readfile-rework-refcount-handling

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

include last master changes

There was a problem in the last merge

Merge branch 'soc-2019-openxr' into vr_scene_inspection

Merge branch 'temp-openxr-blenderside' into soc-2019-openxr

Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside

Merge branch 'temp-openxr-directx' into temp-openxr-ghostxr

Merge branch 'temp-openxr-buildstuff' into temp-openxr-directx

Merge branch 'master' into temp-openxr-buildstuff

GPencil: Fix function renaming after merge

Merge branch 'greasepencil-object' into greasepencil-refactor

Conflicts:
source/blender/blenkernel/intern/gpencil_modifier.c
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
source/blender/draw/engines/gpencil/gpencil_engine.c
source/blender/draw/engines/overlay/overlay_extra.c
source/blender/editors/gpencil/gpencil_fill.c
source/blender/editors/gpencil/gpencil_utils.c
source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c

GPencil: Fix renamed functions after merge

Merge branch 'master' into greasepencil-object

Cleanup: Remove unused function: give_node_material()

T73589: Code Quality: Renaming on BKE_material.h

Old Name New Name
========= =========
init_def_material BKE_materials_init
BKE_material_gpencil_default_free BKE_materials_exit
test_object_materials BKE_object_materials_test
test_all_objects_materials BKE_objects_materials_test_all
give_matarar BKE_object_material_array
give_totcolp BKE_object_material_num
give_current_material_p BKE_object_material_get_p
give_current_material BKE_object_material_get
assign_material BKE_object_material_assign
assign_matarar BKE_object_material_array_assign
give_matarar_id BKE_id_material_array
give_totcolp_id BKE_id_material_num
assign_material_id BKE_id_material_assign
clear_matcopybuf BKE_material_copybuf_clear
free_matcopybuf BKE_material_copybuf_free
copy_matcopybuf BKE_material_copybuf_copy
paste_matcopybuf BKE_material_copybuf_paste
BKE_material_init_gpencil_settings BKE_gpencil_material_attr_init
BKE_material_add_gpencil BKE_gpencil_material_add
BKE_material_gpencil_get BKE_gpencil_material
BKE_material_gpencil_default_get BKE_gpencil_material_default
BKE_material_gpencil_settings_get BKE_gpencil_material_settings

Merge branch 'greasepencil-object' into greasepencil-refactor

Merge branch 'master' into greasepencil-object