Blender Git Commit Log
Git Commits -> Revision 4061661
Revision 4061661 by Hans Goudey (soc-2019-bevel-profiles) September 11, 2019, 00:14 (GMT) |
Fix unintentional differences with master from merge |
Commit Details:
Full Hash: 40616617180bbd9d6717fd22813e07911ed8366f
Parent Commit: 95f8041
Lines Changed: +1176, -168
1 Added Path:
/source/blender/editors/mesh/editmesh_mask_extract.c (+272, -0) (View)
71 Modified Paths:
/build_files/cmake/macros.cmake (+1, -1) (Diff)
/doc/python_api/examples/bpy.types.Depsgraph.1.py (+1, -1) (Diff)
/doc/python_api/examples/bpy.types.UIList.2.py (+0, -1) (Diff)
/intern/cycles/blender/blender_viewport.h (+1, -1) (Diff)
/intern/cycles/kernel/closure/bsdf.h (+7, -3) (Diff)
/release/datafiles/blender_icons_geom.py (+1, -1) (Diff)
/release/datafiles/userdef/userdef_default_theme.c (+1, -0) (Diff)
/release/scripts/freestyle/styles/apriori_density.py (+2, -2) (Diff)
/release/scripts/modules/bl_i18n_utils/utils_rtl.py (+16, -16) (Diff)
/release/scripts/modules/rna_info.py (+1, -1) (Diff)
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+9, -5) (Diff)
/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/mask.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/presets.py (+3, -3) (Diff)
/release/scripts/startup/bl_operators/uvcalc_smart_project.py (+12, -12) (Diff)
/release/scripts/startup/bl_ui/properties_data_gpencil.py (+4, -4) (Diff)
/release/scripts/startup/bl_ui/properties_data_mesh.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_grease_pencil_common.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_material_gpencil.py (+6, -2) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/space_console.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_filebrowser.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_info.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py (+2, -1) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+35, -15) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+7, -0) (Diff)
/source/blender/blenkernel/BKE_gpencil.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_paint.h (+6, -0) (Diff)
/source/blender/blenkernel/BKE_shrinkwrap.h (+5, -0) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+5, -3) (Diff)
/source/blender/blenkernel/intern/paint.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+26, -0) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_cycles.c (+14, -7) (Diff)
/source/blender/blenloader/intern/versioning_userdef.c (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_operator_api.h (+1, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_sampling.c (+1, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_shadows.c (+1, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_shadows_cascade.c (+1, -1) (Diff)
/source/blender/draw/engines/gpencil/gpencil_draw_utils.c (+10, -23) (Diff)
/source/blender/draw/intern/draw_cache_impl_particles.c (+21, -3) (Diff)
/source/blender/draw/modes/edit_mesh_mode.c (+6, -1) (Diff)
/source/blender/draw/modes/shaders/paint_face_vert.glsl (+1, -1) (Diff)
/source/blender/editors/gpencil/gpencil_utils.c (+23, -0) (Diff)
/source/blender/editors/include/ED_gpencil.h (+3, -0) (Diff)
/source/blender/editors/include/UI_icons.h (+5, -1) (Diff)
/source/blender/editors/include/UI_resources.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_icons.c (+1, -0) (Diff)
/source/blender/editors/interface/resources.c (+6, -2) (Diff)
/source/blender/editors/mesh/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_extrude.c (+4, -4) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+8, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+2, -0) (Diff)
/source/blender/editors/physics/particle_edit.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+46, -0) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+499, -4) (Diff)
/source/blender/editors/sculpt_paint/sculpt_intern.h (+11, -0) (Diff)
/source/blender/editors/space_file/file_draw.c (+6, -13) (Diff)
/source/blender/editors/space_file/file_ops.c (+15, -3) (Diff)
/source/blender/makesdna/DNA_brush_types.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+2, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+3, -0) (Diff)
/source/blender/makesdna/intern/dna_genfile.c (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_brush.c (+10, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+6, -14) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+7, -0) (Diff)
/source/blender/python/rna_dump.py (+4, -2) (Diff)
/doc/python_api/examples/bpy.types.Depsgraph.1.py (+1, -1) (Diff)
/doc/python_api/examples/bpy.types.UIList.2.py (+0, -1) (Diff)
/intern/cycles/blender/blender_viewport.h (+1, -1) (Diff)
/intern/cycles/kernel/closure/bsdf.h (+7, -3) (Diff)
/release/datafiles/blender_icons_geom.py (+1, -1) (Diff)
/release/datafiles/userdef/userdef_default_theme.c (+1, -0) (Diff)
/release/scripts/freestyle/styles/apriori_density.py (+2, -2) (Diff)
/release/scripts/modules/bl_i18n_utils/utils_rtl.py (+16, -16) (Diff)
/release/scripts/modules/rna_info.py (+1, -1) (Diff)
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+9, -5) (Diff)
/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/mask.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/presets.py (+3, -3) (Diff)
/release/scripts/startup/bl_operators/uvcalc_smart_project.py (+12, -12) (Diff)
/release/scripts/startup/bl_ui/properties_data_gpencil.py (+4, -4) (Diff)
/release/scripts/startup/bl_ui/properties_data_mesh.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_grease_pencil_common.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_material_gpencil.py (+6, -2) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/space_console.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_filebrowser.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_info.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py (+2, -1) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+35, -15) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+7, -0) (Diff)
/source/blender/blenkernel/BKE_gpencil.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_paint.h (+6, -0) (Diff)
/source/blender/blenkernel/BKE_shrinkwrap.h (+5, -0) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+5, -3) (Diff)
/source/blender/blenkernel/intern/paint.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+26, -0) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_cycles.c (+14, -7) (Diff)
/source/blender/blenloader/intern/versioning_userdef.c (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_operator_api.h (+1, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_sampling.c (+1, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_shadows.c (+1, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_shadows_cascade.c (+1, -1) (Diff)
/source/blender/draw/engines/gpencil/gpencil_draw_utils.c (+10, -23) (Diff)
/source/blender/draw/intern/draw_cache_impl_particles.c (+21, -3) (Diff)
/source/blender/draw/modes/edit_mesh_mode.c (+6, -1) (Diff)
/source/blender/draw/modes/shaders/paint_face_vert.glsl (+1, -1) (Diff)
/source/blender/editors/gpencil/gpencil_utils.c (+23, -0) (Diff)
/source/blender/editors/include/ED_gpencil.h (+3, -0) (Diff)
/source/blender/editors/include/UI_icons.h (+5, -1) (Diff)
/source/blender/editors/include/UI_resources.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_icons.c (+1, -0) (Diff)
/source/blender/editors/interface/resources.c (+6, -2) (Diff)
/source/blender/editors/mesh/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_extrude.c (+4, -4) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+8, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+2, -0) (Diff)
/source/blender/editors/physics/particle_edit.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+46, -0) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+499, -4) (Diff)
/source/blender/editors/sculpt_paint/sculpt_intern.h (+11, -0) (Diff)
/source/blender/editors/space_file/file_draw.c (+6, -13) (Diff)
/source/blender/editors/space_file/file_ops.c (+15, -3) (Diff)
/source/blender/makesdna/DNA_brush_types.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+2, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+3, -0) (Diff)
/source/blender/makesdna/intern/dna_genfile.c (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_brush.c (+10, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+6, -14) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+7, -0) (Diff)
/source/blender/python/rna_dump.py (+4, -2) (Diff)