Blender Git Loki
Git Commits -> Revision a2b41f1
Revision a2b41f1 by Julian Eisel (userpref_redesign) November 22, 2018, 21:15 (GMT) |
Fix merge conflicts Used 'git stash' to stash a single file, which (for some reason) caused quite some trouble. Should be fine again now. |
Commit Details:
Full Hash: a2b41f105cadeacd0160e2959ca86414eac8ca04
Parent Commit: 37b62ac
Lines Changed: +8327, -23779
8 Added Paths:
/release/scripts/presets/gpencil_material/fill_only.py (+32, -0) (View)
/release/scripts/presets/gpencil_material/stroke_and_fill.py (+32, -0) (View)
/release/scripts/presets/gpencil_material/stroke_only.py (+32, -0) (View)
/release/scripts/presets/interface_theme/blender_dark.xml (+6, -0) (View)
/release/scripts/presets/interface_theme/blender_light.xml (+1225, -0) (View)
/release/scripts/presets/keyconfig/blender.py (+107, -0) (View)
/release/scripts/presets/keyconfig/blender_27x.py (+57, -0) (View)
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+5981, -0) (View)
/release/scripts/presets/gpencil_material/stroke_and_fill.py (+32, -0) (View)
/release/scripts/presets/gpencil_material/stroke_only.py (+32, -0) (View)
/release/scripts/presets/interface_theme/blender_dark.xml (+6, -0) (View)
/release/scripts/presets/interface_theme/blender_light.xml (+1225, -0) (View)
/release/scripts/presets/keyconfig/blender.py (+107, -0) (View)
/release/scripts/presets/keyconfig/blender_27x.py (+57, -0) (View)
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+5981, -0) (View)
31 Deleted Paths:
/release/scripts/presets/interaction/3dsmax.py (+0, -12)
/release/scripts/presets/interaction/blender.py (+0, -14)
/release/scripts/presets/interaction/maya.py (+0, -10)
/release/scripts/presets/interface_theme/24x_blues.xml (+0, -1177)
/release/scripts/presets/interface_theme/back_to_black.xml (+0, -1177)
/release/scripts/presets/interface_theme/blender_24x.xml (+0, -1172)
/release/scripts/presets/interface_theme/dark_blue_gradient.xml (+0, -1179)
/release/scripts/presets/interface_theme/default++.xml (+0, -1173)
/release/scripts/presets/interface_theme/elsyiun.xml (+0, -1172)
/release/scripts/presets/interface_theme/flatty_light.xml (+0, -1177)
/release/scripts/presets/interface_theme/graph.xml (+0, -1172)
/release/scripts/presets/interface_theme/hexagon.xml (+0, -1172)
/release/scripts/presets/interface_theme/modern_minimalist.xml (+0, -1183)
/release/scripts/presets/interface_theme/north.xml (+0, -1177)
/release/scripts/presets/interface_theme/rtheme.xml (+0, -1172)
/release/scripts/presets/interface_theme/sandyslate.xml (+0, -1179)
/release/scripts/presets/interface_theme/science_lab.xml (+0, -1172)
/release/scripts/presets/interface_theme/softblend.xml (+0, -1172)
/release/scripts/presets/interface_theme/true_blue_menu.xml (+0, -1177)
/release/scripts/presets/keyconfig/3dsmax.py (+0, -2451)
/release/scripts/presets/keyconfig/maya.py (+0, -1933)
/release/scripts/presets/sunsky/classic.py (+0, -14)
/release/scripts/presets/sunsky/desert.py (+0, -14)
/release/scripts/presets/sunsky/mountain.py (+0, -14)
/release/scripts/presets/units_length/centimeters.py (+0, -5)
/release/scripts/presets/units_length/feet.py (+0, -5)
/release/scripts/presets/units_length/inches.py (+0, -5)
/release/scripts/presets/units_length/kilometers.py (+0, -5)
/release/scripts/presets/units_length/meters.py (+0, -5)
/release/scripts/presets/units_length/miles.py (+0, -5)
/release/scripts/presets/units_length/millimeters.py (+0, -5)
/release/scripts/presets/interaction/blender.py (+0, -14)
/release/scripts/presets/interaction/maya.py (+0, -10)
/release/scripts/presets/interface_theme/24x_blues.xml (+0, -1177)
/release/scripts/presets/interface_theme/back_to_black.xml (+0, -1177)
/release/scripts/presets/interface_theme/blender_24x.xml (+0, -1172)
/release/scripts/presets/interface_theme/dark_blue_gradient.xml (+0, -1179)
/release/scripts/presets/interface_theme/default++.xml (+0, -1173)
/release/scripts/presets/interface_theme/elsyiun.xml (+0, -1172)
/release/scripts/presets/interface_theme/flatty_light.xml (+0, -1177)
/release/scripts/presets/interface_theme/graph.xml (+0, -1172)
/release/scripts/presets/interface_theme/hexagon.xml (+0, -1172)
/release/scripts/presets/interface_theme/modern_minimalist.xml (+0, -1183)
/release/scripts/presets/interface_theme/north.xml (+0, -1177)
/release/scripts/presets/interface_theme/rtheme.xml (+0, -1172)
/release/scripts/presets/interface_theme/sandyslate.xml (+0, -1179)
/release/scripts/presets/interface_theme/science_lab.xml (+0, -1172)
/release/scripts/presets/interface_theme/softblend.xml (+0, -1172)
/release/scripts/presets/interface_theme/true_blue_menu.xml (+0, -1177)
/release/scripts/presets/keyconfig/3dsmax.py (+0, -2451)
/release/scripts/presets/keyconfig/maya.py (+0, -1933)
/release/scripts/presets/sunsky/classic.py (+0, -14)
/release/scripts/presets/sunsky/desert.py (+0, -14)
/release/scripts/presets/sunsky/mountain.py (+0, -14)
/release/scripts/presets/units_length/centimeters.py (+0, -5)
/release/scripts/presets/units_length/feet.py (+0, -5)
/release/scripts/presets/units_length/inches.py (+0, -5)
/release/scripts/presets/units_length/kilometers.py (+0, -5)
/release/scripts/presets/units_length/meters.py (+0, -5)
/release/scripts/presets/units_length/miles.py (+0, -5)
/release/scripts/presets/units_length/millimeters.py (+0, -5)
6 Modified Paths:
/release/scripts/startup/bl_operators/wm.py (+813, -473) (Diff)
/release/scripts/startup/bl_ui/space_info.py (+0, -2) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+1, -0) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+38, -0) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+2, -3) (Diff)
/release/scripts/startup/bl_ui/space_info.py (+0, -2) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+1, -0) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+38, -0) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+2, -3) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021