Blender Git Loki

Git Commits -> Revision 3758f1a

November 11, 2019, 17:45 (GMT)
Revert wrong merge from origin/master

Commit Details:

Full Hash: 3758f1adc86902aefdc4276a8407e47534742e13
Parent Commit: 1e25c23
Lines Changed: +26187, -11461

21 Deleted Paths:

/release/datafiles/blender_icons16/icon16_disk.dat (+0, -0)
/release/datafiles/blender_icons16/icon16_documents.dat (+0, -0)
/release/datafiles/blender_icons16/icon16_home.dat (+0, -0)
/release/datafiles/blender_icons16/icon16_memory.dat (+0, -0)
/release/datafiles/blender_icons16/icon16_options.dat (+0, -0)
/release/datafiles/blender_icons16/icon16_statusbar.dat (+0, -0)
/release/datafiles/blender_icons16/icon16_temp.dat (+0, -0)
/release/datafiles/blender_icons16/icon16_topbar.dat (+0, -0)
/release/datafiles/blender_icons32/icon32_disk.dat (+0, -0)
/release/datafiles/blender_icons32/icon32_documents.dat (+0, -0)
/release/datafiles/blender_icons32/icon32_home.dat (+0, -0)
/release/datafiles/blender_icons32/icon32_memory.dat (+0, -0)
/release/datafiles/blender_icons32/icon32_options.dat (+0, -0)
/release/datafiles/blender_icons32/icon32_statusbar.dat (+0, -0)
/release/datafiles/blender_icons32/icon32_temp.dat (+0, -0)
/release/datafiles/blender_icons32/icon32_topbar.dat (+0, -0)
/release/datafiles/icons/ops.gpencil.primitive_polyline.dat (+0, -0)
/release/datafiles/icons/ops.paint.eyedropper_add.dat (+0, -0)
/source/blender/modifiers/intern/MOD_solidify_extrude.c (+0, -1105)
/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c (+0, -2268)
/source/blender/modifiers/intern/MOD_solidify_util.h (+0, -34)

177 Modified Paths:

/build_files/build_environment/cmake/alembic.cmake (+1, -1) (Diff)
/build_files/build_environment/cmake/boost.cmake (+5, -5) (Diff)
/build_files/build_environment/cmake/clang.cmake (+2, -2) (Diff)
/build_files/build_environment/cmake/harvest.cmake (+3, -1) (Diff)
/build_files/build_environment/cmake/llvm.cmake (+2, -2) (Diff)
/build_files/build_environment/cmake/opencolorio.cmake (+2, -2) (Diff)
/build_files/build_environment/cmake/openimageio.cmake (+1, -1) (Diff)
/build_files/build_environment/cmake/opensubdiv.cmake (+1, -0) (Diff)
/build_files/build_environment/cmake/openvdb.cmake (+1, -1) (Diff)
/build_files/build_environment/cmake/options.cmake (+10, -10) (Diff)
/build_files/build_environment/cmake/osl.cmake (+1, -1) (Diff)
/build_files/build_environment/cmake/versions.cmake (+2, -2) (Diff)
/build_files/build_environment/cmake/webp.cmake (+0, -9) (Diff)
/build_files/build_environment/cmake/yamlcpp.cmake (+1, -1) (Diff)
/build_files/build_environment/patches/opencollada.diff (+13, -44) (Diff)
/build_files/cmake/macros.cmake (+0, -4) (Diff)
/build_files/cmake/platform/platform_win32.cmake (+22, -22) (Diff)
/build_files/utils/make_update.py (+1, -1) (Diff)
/build_files/windows/check_libraries.cmd (+4, -5) (Diff)
/build_files/windows/find_dependencies.cmd (+1, -1) (Diff)
/build_files/windows/format.cmd (+3, -3) (Diff)
/intern/cycles/blender/addon/engine.py (+3, -3) (Diff)
/intern/cycles/CMakeLists.txt (+0, -3) (Diff)
/intern/cycles/device/device_cuda.cpp (+0, -6) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+7, -17) (Diff)
/intern/cycles/kernel/filter/filter_transform_gpu.h (+3, -3) (Diff)
/intern/cycles/kernel/filter/filter_transform_sse.h (+3, -3) (Diff)
/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp (+2, -0) (Diff)
/intern/ghost/intern/GHOST_SystemPathsWin32.cpp (+7, -10) (Diff)
/intern/ghost/intern/GHOST_SystemPathsWin32.h (+2, -0) (Diff)
/intern/ghost/intern/GHOST_TaskbarWin32.h (+4, -0) (Diff)
/intern/ghost/intern/GHOST_WindowViewCocoa.h (+0, -5) (Diff)
/intern/opensubdiv/internal/opensubdiv_evaluator.cc (+0, -13) (Diff)
/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc (+124, -163) (Diff)
/intern/opensubdiv/internal/opensubdiv_evaluator_internal.h (+0, -13) (Diff)
/intern/opensubdiv/opensubdiv_capi_type.h (+0, -7) (Diff)
/intern/opensubdiv/opensubdiv_evaluator_capi.h (+0, -14) (Diff)
/intern/openvdb/CMakeLists.txt (+0, -6) (Diff)
/release/datafiles/blender_icons.svg (+23728, -5119) (Diff)
/release/datafiles/blender_icons16/icon16_con_action.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_desktop.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_filebrowser.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_file_archive.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_file_folder.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_file_font.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_file_script.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_file_sound.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_mod_mirror.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_newfolder.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_plugin.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_preset.dat (+0, -0) (Diff)
/release/datafiles/blender_icons16/icon16_select_intersect.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_con_action.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_desktop.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_filebrowser.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_file_archive.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_file_folder.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_file_font.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_file_script.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_file_sound.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_mod_mirror.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_newfolder.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_plugin.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_preset.dat (+0, -0) (Diff)
/release/datafiles/blender_icons32/icon32_select_intersect.dat (+0, -0) (Diff)
/release/datafiles/prvicons.png (+0, -0) (Diff)
/release/datafiles/prvicons.svg (+24, -46) (Diff)
/release/datafiles/userdef/userdef_default_theme.c (+0, -1) (Diff)
/release/scripts/modules/bl_keymap_utils/keymap_from_toolbar.py (+4, -4) (Diff)
/release/scripts/modules/bpy/path.py (+1, -2) (Diff)
/release/scripts/modules/bpy/utils/__init__.py (+0, -35) (Diff)
/release/scripts/modules/bpy_extras/object_utils.py (+41, -0) (Diff)
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+0, -5) (Diff)
/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py (+0, -1) (Diff)
/release/scripts/startup/bl_operators/add_mesh_torus.py (+1, -2) (Diff)
/release/scripts/startup/bl_operators/presets.py (+0, -6) (Diff)
/release/scripts/startup/bl_operators/sequencer.py (+3, -7) (Diff)
/release/scripts/startup/bl_operators/userpref.py (+2, -2) (Diff)
/release/scripts/startup/bl_operators/uvcalc_follow_active.py (+1, -4) (Diff)
/release/scripts/startup/bl_operators/wm.py (+5, -132) (Diff)
/release/scripts/startup/bl_ui/properties_constraint.py (+3, -6) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+6, -22) (Diff)
/release/scripts/startup/bl_ui/space_filebrowser.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+0, -3) (Diff)
/release/scripts/startup/bl_ui/space_sequencer.py (+2, -13) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+0, -63) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+1, -5) (Diff)
/source/blender/alembic/intern/abc_mesh.cc (+133, -97) (Diff)
/source/blender/alembic/intern/abc_mesh.h (+2, -2) (Diff)
/source/blender/blenfont/intern/blf_internal_types.h (+3, -2) (Diff)
/source/blender/blenkernel/BKE_constraint.h (+6, -2) (Diff)
/source/blender/blenkernel/BKE_idprop.h (+0, -1) (Diff)
/source/blender/blenkernel/BKE_particle.h (+0, -4) (Diff)
/source/blender/blenkernel/intern/constraint.c (+84, -43) (Diff)
/source/blender/blenkernel/intern/fcurve.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/idprop.c (+0, -6) (Diff)
/source/blender/blenkernel/intern/layer.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+2, -27) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+15, -33) (Diff)
/source/blender/blenkernel/intern/smoke.c (+7, -2) (Diff)
/source/blender/blenlib/BLI_buffer.h (+0, -10) (Diff)
/source/blender/blenlib/BLI_task.h (+3, -37) (Diff)
/source/blender/blenlib/intern/BLI_temporary_allocator.cc (+1, -1) (Diff)
/source/blender/blenlib/intern/expr_pylike_eval.c (+0, -7) (Diff)
/source/blender/blenlib/intern/math_solvers.c (+3, -3) (Diff)
/source/blender/blenlib/intern/task.c (+101, -261) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+0, -5) (Diff)
/source/blender/blenloader/intern/versioning_userdef.c (+0, -1) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+20, -64) (Diff)
/source/blender/draw/engines/gpencil/gpencil_draw_utils.c (+15, -6) (Diff)
/source/blender/draw/engines/gpencil/gpencil_engine.c (+0, -44) (Diff)
/source/blender/draw/engines/gpencil/gpencil_engine.h (+0, -2) (Diff)
/source/blender/draw/modes/edit_mesh_mode.c (+1, -1) (Diff)
/source/blender/draw/modes/object_mode.c (+1, -2) (Diff)
/source/blender/editors/animation/anim_markers.c (+1, -1) (Diff)
/source/blender/editors/datafiles/CMakeLists.txt (+0, -2) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+1, -3) (Diff)
/source/blender/editors/include/ED_mask.h (+15, -15) (Diff)
/source/blender/editors/include/ED_transform_snap_object_context.h (+0, -2) (Diff)
/source/blender/editors/include/UI_icons.h (+8, -8) (Diff)
/source/blender/editors/include/UI_interface.h (+0, -6) (Diff)
/source/blender/editors/interface/interface_layout.c (+10, -20) (Diff)
/source/blender/editors/interface/interface_templates.c (+0, -36) (Diff)
/source/blender/editors/interface/interface_widgets.c (+10, -23) (Diff)
/source/blender/editors/mask/mask_add.c (+83, -144) (Diff)
/source/blender/editors/mask/mask_draw.c (+58, -61) (Diff)
/source/blender/editors/mask/mask_edit.c (+6, -4) (Diff)
/source/blender/editors/mask/mask_editaction.c (+91, -92) (Diff)
/source/blender/editors/mask/mask_intern.h (+5, -5) (Diff)
/source/blender/editors/mask/mask_ops.c (+126, -103) (Diff)
/source/blender/editors/mask/mask_relationships.c (+16, -8) (Diff)
/source/blender/editors/mask/mask_select.c (+88, -56) (Diff)
/source/blender/editors/mask/mask_shapekey.c (+95, -84) (Diff)
/source/blender/editors/render/render_view.c (+2, -3) (Diff)
/source/blender/editors/screen/area.c (+11, -36) (Diff)
/source/blender/editors/screen/screen_edit.c (+13, -14) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -1) (Diff)
/source/blender/editors/space_file/filelist.c (+1, -1) (Diff)
/source/blender/editors/space_file/file_ops.c (+37, -27) (Diff)
/source/blender/editors/space_graph/graph_edit.c (+1, -0) (Diff)
/source/blender/editors/space_graph/space_graph.c (+2, -4) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+2, -2) (Diff)
/source/blender/editors/space_sequencer/sequencer_edit.c (+0, -64) (Diff)
/source/blender/editors/space_sequencer/sequencer_intern.h (+1, -3) (Diff)
/source/blender/editors/space_sequencer/sequencer_ops.c (+1, -3) (Diff)
/source/blender/editors/space_sequencer/sequencer_select.c (+15, -71) (Diff)
/source/blender/editors/space_view3d/view3d_view.c (+0, -6) (Diff)
/source/blender/editors/transform/transform.c (+1, -1) (Diff)
/source/blender/editors/transform/transform.h (+1, -1) (Diff)
/source/blender/editors/transform/transform_convert.c (+2, -3) (Diff)
/source/blender/editors/transform/transform_generics.c (+6, -10) (Diff)
/source/blender/editors/transform/transform_snap.c (+0, -4) (Diff)
/source/blender/editors/transform/transform_snap_object.c (+21, -165) (Diff)
/source/blender/makesdna/DNA_constraint_types.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+1, -29) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_screen_types.h (+2, -3) (Diff)
/source/blender/makesdna/DNA_space_types.h (+0, -16) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+0, -18) (Diff)
/source/blender/makesrna/intern/rna_constraint.c (+3, -8) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+3, -75) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+0, -5) (Diff)
/source/blender/makesrna/intern/rna_space.c (+3, -12) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+0, -17) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+26, -95) (Diff)
/source/blender/makesrna/intern/rna_wm_api.c (+0, -16) (Diff)
/source/blender/modifiers/CMakeLists.txt (+0, -3) (Diff)
/source/blender/modifiers/intern/MOD_solidify.c (+917, -16) (Diff)
/source/blender/python/generic/py_capi_utils.c (+14, -9) (Diff)
/source/blender/python/mathutils/mathutils_geometry.c (+1, -49) (Diff)
/source/blender/python/mathutils/mathutils_kdtree.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+18, -17) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+1, -1) (Diff)
/source/blender/windowmanager/WM_api.h (+0, -4) (Diff)
/tests/gtests/blenlib/BLI_task_performance_test.cc (+6, -26) (Diff)
/tests/gtests/blenlib/BLI_task_test.cc (+2, -8) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021