Blender Git Loki

Git Commits -> Revision 2f47128

Revision 2f47128 by Peter Kim (xr-controller-support)
August 7, 2021, 09:36 (GMT)
Merge branch 'master' into xr-controller-support

Commit Details:

Full Hash: 2f4712841a387e4baca15f6d43f608fc706ab74e
Parent Commit: 6dec69d
Lines Changed: +3904, -3686

5 Added Paths:

/build_files/windows/doc_py.cmd (+34, -0) (View)
/build_files/windows/find_sphinx.cmd (+23, -0) (View)
/extern/nanosvg/nanosvg.h (+3327, -0) (View)
/extern/nanosvg/patches/NanoSVG.diff (+86, -0) (View)
/extern/nanosvg/README.blender (+7, -0) (View)

1 Deleted Path:

/source/blender/io/gpencil/nanosvg/nanosvg.h (+0, -3327)

51 Modified Paths:

/build_files/windows/parse_arguments.cmd (+3, -0) (Diff)
/build_files/windows/reset_variables.cmd (+2, -1) (Diff)
/build_files/windows/show_help.cmd (+4, -0) (Diff)
/intern/cycles/render/session.cpp (+152, -133) (Diff)
/intern/cycles/render/session.h (+24, -21) (Diff)
/make.bat (+15, -0) (Diff)
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/space_filebrowser.py (+4, -4) (Diff)
/source/blender/blenkernel/BKE_context.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/context.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/workspace.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_range.h (+5, -0) (Diff)
/source/blender/blenloader/intern/versioning_300.c (+29, -3) (Diff)
/source/blender/blenloader/intern/writefile.c (+2, -2) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+5, -0) (Diff)
/source/blender/draw/intern/draw_cache_impl_gpencil.c (+1, -1) (Diff)
/source/blender/editors/animation/anim_draw.c (+1, -1) (Diff)
/source/blender/editors/animation/keyframes_keylist.c (+60, -59) (Diff)
/source/blender/editors/armature/pose_lib_2.c (+5, -5) (Diff)
/source/blender/editors/armature/pose_slide.c (+2, -2) (Diff)
/source/blender/editors/asset/ED_asset_handle.h (+1, -1) (Diff)
/source/blender/editors/asset/ED_asset_temp_id_consumer.h (+1, -1) (Diff)
/source/blender/editors/asset/intern/asset_handle.cc (+2, -2) (Diff)
/source/blender/editors/asset/intern/asset_ops.cc (+2, -2) (Diff)
/source/blender/editors/asset/intern/asset_temp_id_consumer.cc (+5, -5) (Diff)
/source/blender/editors/gpencil/gpencil_primitive.c (+1, -1) (Diff)
/source/blender/editors/include/ED_keyframes_keylist.h (+19, -17) (Diff)
/source/blender/editors/interface/interface_template_asset_view.cc (+12, -12) (Diff)
/source/blender/editors/screen/screen_context.c (+3, -3) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -1) (Diff)
/source/blender/editors/space_action/action_select.c (+3, -4) (Diff)
/source/blender/editors/space_file/filelist.c (+15, -15) (Diff)
/source/blender/editors/space_file/filelist.h (+1, -1) (Diff)
/source/blender/editors/space_file/filesel.c (+3, -3) (Diff)
/source/blender/editors/space_file/file_draw.c (+1, -1) (Diff)
/source/blender/editors/space_file/space_file.c (+4, -4) (Diff)
/source/blender/editors/transform/transform.c (+3, -0) (Diff)
/source/blender/editors/transform/transform.h (+1, -1) (Diff)
/source/blender/editors/transform/transform_convert.c (+2, -12) (Diff)
/source/blender/editors/transform/transform_generics.c (+1, -2) (Diff)
/source/blender/editors/transform/transform_snap.c (+13, -16) (Diff)
/source/blender/io/alembic/intern/abc_reader_nurbs.cc (+1, -3) (Diff)
/source/blender/io/gpencil/CMakeLists.txt (+1, -3) (Diff)
/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc (+1, -1) (Diff)
/source/blender/makesdna/DNA_asset_types.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_space_types.h (+1, -1) (Diff)
/source/blender/makesdna/dna_workspace_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_asset.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_space.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_workspace.c (+2, -2) (Diff)
/source/blender/python/intern/bpy_rna_operator.c (+1, -1) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021