Blender Git Loki

Git Commits -> Revision d46184a

June 8, 2020, 10:24 (GMT)
Continue merge

Commit Details:

Full Hash: d46184a218a662c4be4a52ae08cce18fe5db4805
Parent Commit: 97e3de6
Lines Changed: +10145, -6210

6 Added Paths:

/source/blender/blenloader/BLO_read_write.h (+227, -0) (View)
/source/blender/bmesh/intern/bmesh_mesh_convert.c (+1151, -0) (View)
/source/blender/bmesh/intern/bmesh_mesh_convert.h (+75, -0) (View)
/source/blender/bmesh/operators/bmo_mesh_convert.c (+74, -0) (View)
/source/blender/modifiers/intern/MOD_ui_common.c (+426, -0) (View)
/source/blender/modifiers/intern/MOD_ui_common.h (+70, -0) (View)

3 Deleted Paths:

/source/blender/bmesh/intern/bmesh_mesh_conv.c (+0, -1151)
/source/blender/bmesh/intern/bmesh_mesh_conv.h (+0, -75)
/source/blender/bmesh/operators/bmo_mesh_conv.c (+0, -74)

165 Modified Paths:

/build_files/build_environment/install_deps.sh (+8, -2) (Diff)
/intern/cycles/device/device_optix.cpp (+11, -23) (Diff)
/intern/ghost/intern/GHOST_XRGraphicsBinding.cpp (+1, -1) (Diff)
/intern/mantaflow/intern/MANTA_main.cpp (+222, -83) (Diff)
/intern/mantaflow/intern/strings/fluid_script.h (+40, -40) (Diff)
/intern/mantaflow/intern/strings/liquid_script.h (+34, -34) (Diff)
/intern/mantaflow/intern/strings/smoke_script.h (+36, -36) (Diff)
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+18, -20) (Diff)
/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py (+6, -6) (Diff)
/release/scripts/startup/bl_operators/wm.py (+8, -3) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+1, -1802) (Diff)
/release/scripts/startup/bl_ui/space_info.py (+29, -1) (Diff)
/release/scripts/startup/bl_ui/space_outliner.py (+12, -2) (Diff)
/release/scripts/startup/bl_ui/space_sequencer.py (+1, -19) (Diff)
/source/blender/blenfont/BLF_api.h (+2, -0) (Diff)
/source/blender/blenfont/intern/blf_font.c (+1, -10) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+54, -27) (Diff)
/source/blender/blenfont/intern/blf_internal_types.h (+5, -5) (Diff)
/source/blender/blenfont/intern/blf_thumbs.c (+5, -4) (Diff)
/source/blender/blenkernel/BKE_fcurve.h (+33, -36) (Diff)
/source/blender/blenkernel/BKE_modifier.h (+10, -0) (Diff)
/source/blender/blenkernel/intern/action.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/anim_data.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/fcurve.c (+41, -44) (Diff)
/source/blender/blenkernel/intern/gpencil.c (+5, -7) (Diff)
/source/blender/blenkernel/intern/ipo.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/modifier.c (+14, -1) (Diff)
/source/blender/blenkernel/intern/nla.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/object.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/scene.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+2, -2) (Diff)
/source/blender/blenlib/BLI_math_color.h (+12, -12) (Diff)
/source/blender/blenlib/intern/math_color.c (+67, -67) (Diff)
/source/blender/blenloader/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+1042, -911) (Diff)
/source/blender/blenloader/intern/undofile.c (+28, -17) (Diff)
/source/blender/blenloader/intern/versioning_250.c (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_290.c (+13, -0) (Diff)
/source/blender/blenloader/intern/versioning_defaults.c (+4, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+949, -856) (Diff)
/source/blender/bmesh/bmesh.h (+1, -1) (Diff)
/source/blender/bmesh/CMakeLists.txt (+3, -3) (Diff)
/source/blender/draw/engines/select/select_draw_utils.c (+0, -4) (Diff)
/source/blender/editors/animation/anim_channels_edit.c (+3, -3) (Diff)
/source/blender/editors/animation/anim_filter.c (+1, -1) (Diff)
/source/blender/editors/animation/drivers.c (+8, -7) (Diff)
/source/blender/editors/animation/keyframing.c (+8, -7) (Diff)
/source/blender/editors/armature/armature_add.c (+2, -2) (Diff)
/source/blender/editors/armature/armature_select.c (+2, -2) (Diff)
/source/blender/editors/curve/editcurve.c (+6, -6) (Diff)
/source/blender/editors/curve/editcurve_undo.c (+8, -8) (Diff)
/source/blender/editors/gpencil/gpencil_fill.c (+3, -1) (Diff)
/source/blender/editors/gpencil/gpencil_select.c (+2, -41) (Diff)
/source/blender/editors/gpencil/gpencil_utils.c (+47, -0) (Diff)
/source/blender/editors/gpencil/gpencil_vertex_paint.c (+34, -9) (Diff)
/source/blender/editors/include/ED_armature.h (+1, -1) (Diff)
/source/blender/editors/include/ED_gpencil.h (+4, -0) (Diff)
/source/blender/editors/include/ED_object.h (+17, -12) (Diff)
/source/blender/editors/include/UI_interface.h (+1, -1) (Diff)
/source/blender/editors/interface/interface_anim.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_panel.c (+24, -10) (Diff)
/source/blender/editors/interface/interface_style.c (+6, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+30, -338) (Diff)
/source/blender/editors/interface/view2d_ops.c (+185, -0) (Diff)
/source/blender/editors/object/object_constraint.c (+22, -20) (Diff)
/source/blender/editors/object/object_intern.h (+1, -0) (Diff)
/source/blender/editors/object/object_modifier.c (+102, -6) (Diff)
/source/blender/editors/object/object_ops.c (+1, -0) (Diff)
/source/blender/editors/object/object_shader_fx.c (+0, -5) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -1) (Diff)
/source/blender/editors/space_action/action_edit.c (+1, -1) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+12, -0) (Diff)
/source/blender/editors/space_graph/graph_buttons.c (+1, -1) (Diff)
/source/blender/editors/space_graph/graph_draw.c (+1, -1) (Diff)
/source/blender/editors/space_graph/graph_edit.c (+5, -4) (Diff)
/source/blender/editors/space_graph/graph_utils.c (+2, -2) (Diff)
/source/blender/editors/space_graph/space_graph.c (+1, -1) (Diff)
/source/blender/editors/space_info/info_report.c (+9, -11) (Diff)
/source/blender/editors/space_info/space_info.c (+1, -1) (Diff)
/source/blender/editors/space_nla/nla_draw.c (+1, -1) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_edit.c (+296, -32) (Diff)
/source/blender/editors/space_sequencer/sequencer_intern.h (+1, -15) (Diff)
/source/blender/editors/space_sequencer/sequencer_ops.c (+1, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_select.c (+181, -79) (Diff)
/source/blender/io/collada/AnimationImporter.cpp (+2, -2) (Diff)
/source/blender/io/collada/BCAnimationCurve.cpp (+1, -1) (Diff)
/source/blender/io/collada/BCAnimationSampler.cpp (+1, -1) (Diff)
/source/blender/makesdna/DNA_fluid_types.h (+139, -49) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+4, -2) (Diff)
/source/blender/makesdna/DNA_space_types.h (+3, -2) (Diff)
/source/blender/makesdna/DNA_windowmanager_types.h (+1, -1) (Diff)
/source/blender/makesdna/intern/dna_rename_defs.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_access.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_action.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_animation.c (+4, -4) (Diff)
/source/blender/makesrna/intern/rna_constraint.c (+2, -20) (Diff)
/source/blender/makesrna/intern/rna_fcurve.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_image.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+43, -55) (Diff)
/source/blender/makesrna/intern/rna_nla.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_space.c (+16, -5) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+2, -6) (Diff)
/source/blender/modifiers/CMakeLists.txt (+10, -0) (Diff)
/source/blender/modifiers/intern/MOD_armature.c (+42, -0) (Diff)
/source/blender/modifiers/intern/MOD_array.c (+185, -0) (Diff)
/source/blender/modifiers/intern/MOD_bevel.c (+156, -0) (Diff)
/source/blender/modifiers/intern/MOD_boolean.c (+38, -0) (Diff)
/source/blender/modifiers/intern/MOD_build.c (+56, -0) (Diff)
/source/blender/modifiers/intern/MOD_cast.c (+53, -0) (Diff)
/source/blender/modifiers/intern/MOD_cloth.c (+29, -0) (Diff)
/source/blender/modifiers/intern/MOD_collision.c (+29, -0) (Diff)
/source/blender/modifiers/intern/MOD_correctivesmooth.c (+48, -0) (Diff)
/source/blender/modifiers/intern/MOD_curve.c (+35, -0) (Diff)
/source/blender/modifiers/intern/MOD_datatransfer.c (+242, -0) (Diff)
/source/blender/modifiers/intern/MOD_decimate.c (+63, -0) (Diff)
/source/blender/modifiers/intern/MOD_displace.c (+79, -0) (Diff)
/source/blender/modifiers/intern/MOD_dynamicpaint.c (+29, -0) (Diff)
/source/blender/modifiers/intern/MOD_edgesplit.c (+38, -0) (Diff)
/source/blender/modifiers/intern/MOD_explode.c (+55, -0) (Diff)
/source/blender/modifiers/intern/MOD_fluid.c (+29, -0) (Diff)
/source/blender/modifiers/intern/MOD_hook.c (+81, -0) (Diff)
/source/blender/modifiers/intern/MOD_laplaciandeform.c (+47, -0) (Diff)
/source/blender/modifiers/intern/MOD_laplaciansmooth.c (+48, -1) (Diff)
/source/blender/modifiers/intern/MOD_lattice.c (+36, -0) (Diff)
/source/blender/modifiers/intern/MOD_mask.cc (+53, -0) (Diff)
/source/blender/modifiers/intern/MOD_meshcache.c (+95, -2) (Diff)
/source/blender/modifiers/intern/MOD_meshdeform.c (+49, -0) (Diff)
/source/blender/modifiers/intern/MOD_meshsequencecache.c (+46, -1) (Diff)
/source/blender/modifiers/intern/MOD_mirror.c (+99, -0) (Diff)
/source/blender/modifiers/intern/MOD_multires.c (+147, -0) (Diff)
/source/blender/modifiers/intern/MOD_normal_edit.c (+91, -1) (Diff)
/source/blender/modifiers/intern/MOD_ocean.c (+180, -0) (Diff)
/source/blender/modifiers/intern/MOD_particleinstance.c (+135, -0) (Diff)
/source/blender/modifiers/intern/MOD_particlesystem.c (+49, -0) (Diff)
/source/blender/modifiers/intern/MOD_remesh.c (+63, -2) (Diff)
/source/blender/modifiers/intern/MOD_screw.c (+90, -0) (Diff)
/source/blender/modifiers/intern/MOD_shapekey.c (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_shrinkwrap.c (+71, -0) (Diff)
/source/blender/modifiers/intern/MOD_simpledeform.c (+86, -0) (Diff)
/source/blender/modifiers/intern/MOD_simulation.cc (+33, -0) (Diff)
/source/blender/modifiers/intern/MOD_skin.c (+73, -0) (Diff)
/source/blender/modifiers/intern/MOD_smooth.c (+43, -0) (Diff)
/source/blender/modifiers/intern/MOD_softbody.c (+29, -0) (Diff)
/source/blender/modifiers/intern/MOD_solidify.c (+172, -0) (Diff)
/source/blender/modifiers/intern/MOD_subsurf.c (+151, -0) (Diff)
/source/blender/modifiers/intern/MOD_surface.c (+29, -0) (Diff)
/source/blender/modifiers/intern/MOD_surfacedeform.c (+55, -2) (Diff)
/source/blender/modifiers/intern/MOD_triangulate.c (+36, -0) (Diff)
/source/blender/modifiers/intern/MOD_uvproject.c (+49, -0) (Diff)
/source/blender/modifiers/intern/MOD_uvwarp.c (+76, -0) (Diff)
/source/blender/modifiers/intern/MOD_warp.c (+117, -0) (Diff)
/source/blender/modifiers/intern/MOD_wave.c (+128, -0) (Diff)
/source/blender/modifiers/intern/MOD_weighted_normal.c (+41, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvgedit.c (+97, -0) (Diff)
/source/blender/modifiers/intern/MOD_weightvgmix.c (+60, -0) (Diff)
/source/blender/modifiers/intern/MOD_weightvgproximity.c (+71, -0) (Diff)
/source/blender/modifiers/intern/MOD_weightvg_util.c (+54, -0) (Diff)
/source/blender/modifiers/intern/MOD_weightvg_util.h (+3, -0) (Diff)
/source/blender/modifiers/intern/MOD_weld.c (+34, -0) (Diff)
/source/blender/modifiers/intern/MOD_wireframe.c (+75, -0) (Diff)
/source/blender/python/intern/bpy_rna_anim.c (+4, -4) (Diff)
/tests/gtests/blenkernel/BKE_fcurve_test.cc (+8, -8) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021