[Bf-blender-cvs] [a2b41f105ca] userpref_redesign: Fix merge conflicts
Julian Eisel
noreply at git.blender.org
Thu Nov 22 22:35:16 CET 2018
Commit: a2b41f105cadeacd0160e2959ca86414eac8ca04
Author: Julian Eisel
Date: Thu Nov 22 22:15:17 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rBa2b41f105cadeacd0160e2959ca86414eac8ca04
Fix merge conflicts
Used 'git stash' to stash a single file, which (for some reason) caused quite
some trouble. Should be fine again now.
===================================================================
A release/scripts/presets/gpencil_material/fill_only.py
A release/scripts/presets/gpencil_material/stroke_and_fill.py
A release/scripts/presets/gpencil_material/stroke_only.py
D release/scripts/presets/interaction/3dsmax.py
D release/scripts/presets/interaction/blender.py
D release/scripts/presets/interaction/maya.py
D release/scripts/presets/interface_theme/24x_blues.xml
D release/scripts/presets/interface_theme/back_to_black.xml
D release/scripts/presets/interface_theme/blender_24x.xml
A release/scripts/presets/interface_theme/blender_dark.xml
R088 release/scripts/presets/interface_theme/flatty_light.xml release/scripts/presets/interface_theme/blender_light.xml
D release/scripts/presets/interface_theme/dark_blue_gradient.xml
D release/scripts/presets/interface_theme/default++.xml
D release/scripts/presets/interface_theme/elsyiun.xml
D release/scripts/presets/interface_theme/graph.xml
D release/scripts/presets/interface_theme/hexagon.xml
D release/scripts/presets/interface_theme/modern_minimalist.xml
D release/scripts/presets/interface_theme/north.xml
D release/scripts/presets/interface_theme/rtheme.xml
D release/scripts/presets/interface_theme/sandyslate.xml
D release/scripts/presets/interface_theme/science_lab.xml
D release/scripts/presets/interface_theme/softblend.xml
D release/scripts/presets/interface_theme/true_blue_menu.xml
D release/scripts/presets/keyconfig/3dsmax.py
A release/scripts/presets/keyconfig/blender.py
A release/scripts/presets/keyconfig/blender_27x.py
A release/scripts/presets/keyconfig/keymap_data/blender_default.py
D release/scripts/presets/keyconfig/maya.py
D release/scripts/presets/sunsky/classic.py
D release/scripts/presets/sunsky/desert.py
D release/scripts/presets/sunsky/mountain.py
D release/scripts/presets/units_length/centimeters.py
D release/scripts/presets/units_length/feet.py
D release/scripts/presets/units_length/inches.py
D release/scripts/presets/units_length/kilometers.py
D release/scripts/presets/units_length/meters.py
D release/scripts/presets/units_length/miles.py
D release/scripts/presets/units_length/millimeters.py
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/space_info.py
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/screen/screen_ops.c
M source/blender/makesdna/DNA_userdef_types.h
===================================================================
diff --git a/release/scripts/presets/gpencil_material/fill_only.py b/release/scripts/presets/gpencil_material/fill_only.py
new file mode 100644
index 00000000000..b15f5f28f80
--- /dev/null
+++ b/release/scripts/presets/gpencil_material/fill_only.py
@@ -0,0 +1,32 @@
+import bpy
+material = bpy.context.object.active_material
+gpcolor = material.grease_pencil
+
+gpcolor.mode = 'LINE'
+gpcolor.stroke_style = 'SOLID'
+gpcolor.color = (0.0, 0.0, 0.0, 0.0)
+gpcolor.stroke_image = None
+gpcolor.pixel_size = 100.0
+gpcolor.use_stroke_pattern = False
+gpcolor.fill_style = 'SOLID'
+gpcolor.fill_color = (0.5, 0.5, 0.5, 1.0)
+gpcolor.fill_image = None
+gpcolor.gradient_type = 'LINEAR'
+gpcolor.mix_color = (1.0, 1.0, 1.0, 0.2)
+gpcolor.mix_factor = 0.0
+gpcolor.flip = False
+gpcolor.pattern_shift = (0.0, 0.0)
+gpcolor.pattern_scale = (1.0, 1.0)
+gpcolor.pattern_radius = 0.5
+gpcolor.pattern_angle = 0.0
+gpcolor.pattern_gridsize = 0.1
+gpcolor.use_fill_pattern = False
+gpcolor.texture_offset = (0.0, 0.0)
+gpcolor.texture_scale = (1.0, 1.0)
+gpcolor.texture_angle = 0.0
+gpcolor.texture_opacity = 1.0
+gpcolor.texture_clamp = False
+gpcolor.texture_mix = False
+gpcolor.mix_factor = 0.0
+gpcolor.show_stroke = False
+gpcolor.show_fill = True
diff --git a/release/scripts/presets/gpencil_material/stroke_and_fill.py b/release/scripts/presets/gpencil_material/stroke_and_fill.py
new file mode 100644
index 00000000000..b9a1e873ea2
--- /dev/null
+++ b/release/scripts/presets/gpencil_material/stroke_and_fill.py
@@ -0,0 +1,32 @@
+import bpy
+material = bpy.context.object.active_material
+gpcolor = material.grease_pencil
+
+gpcolor.mode = 'LINE'
+gpcolor.stroke_style = 'SOLID'
+gpcolor.color = (0.0, 0.0, 0.0, 1.0)
+gpcolor.stroke_image = None
+gpcolor.pixel_size = 100.0
+gpcolor.use_stroke_pattern = False
+gpcolor.fill_style = 'SOLID'
+gpcolor.fill_color = (0.5, 0.5, 0.5, 1.0)
+gpcolor.fill_image = None
+gpcolor.gradient_type = 'LINEAR'
+gpcolor.mix_color = (1.0, 1.0, 1.0, 0.2)
+gpcolor.mix_factor = 0.0
+gpcolor.flip = False
+gpcolor.pattern_shift = (0.0, 0.0)
+gpcolor.pattern_scale = (1.0, 1.0)
+gpcolor.pattern_radius = 0.5
+gpcolor.pattern_angle = 0.0
+gpcolor.pattern_gridsize = 0.1
+gpcolor.use_fill_pattern = False
+gpcolor.texture_offset = (0.0, 0.0)
+gpcolor.texture_scale = (1.0, 1.0)
+gpcolor.texture_angle = 0.0
+gpcolor.texture_opacity = 1.0
+gpcolor.texture_clamp = False
+gpcolor.texture_mix = False
+gpcolor.mix_factor = 0.0
+gpcolor.show_stroke = True
+gpcolor.show_fill = True
diff --git a/release/scripts/presets/gpencil_material/stroke_only.py b/release/scripts/presets/gpencil_material/stroke_only.py
new file mode 100644
index 00000000000..96739af59f0
--- /dev/null
+++ b/release/scripts/presets/gpencil_material/stroke_only.py
@@ -0,0 +1,32 @@
+import bpy
+material = bpy.context.object.active_material
+gpcolor = material.grease_pencil
+
+gpcolor.mode = 'LINE'
+gpcolor.stroke_style = 'SOLID'
+gpcolor.color = (0.0, 0.0, 0.0, 1.0)
+gpcolor.stroke_image = None
+gpcolor.pixel_size = 100.0
+gpcolor.use_stroke_pattern = False
+gpcolor.fill_style = 'SOLID'
+gpcolor.fill_color = (0.5, 0.5, 0.5, 0.0)
+gpcolor.fill_image = None
+gpcolor.gradient_type = 'LINEAR'
+gpcolor.mix_color = (1.0, 1.0, 1.0, 0.2)
+gpcolor.mix_factor = 0.0
+gpcolor.flip = False
+gpcolor.pattern_shift = (0.0, 0.0)
+gpcolor.pattern_scale = (1.0, 1.0)
+gpcolor.pattern_radius = 0.5
+gpcolor.pattern_angle = 0.0
+gpcolor.pattern_gridsize = 0.1
+gpcolor.use_fill_pattern = False
+gpcolor.texture_offset = (0.0, 0.0)
+gpcolor.texture_scale = (1.0, 1.0)
+gpcolor.texture_angle = 0.0
+gpcolor.texture_opacity = 1.0
+gpcolor.texture_clamp = False
+gpcolor.texture_mix = False
+gpcolor.mix_factor = 0.0
+gpcolor.show_stroke = True
+gpcolor.show_fill = False
diff --git a/release/scripts/presets/interaction/3dsmax.py b/release/scripts/presets/interaction/3dsmax.py
deleted file mode 100644
index 681aa4ab4b7..00000000000
--- a/release/scripts/presets/interaction/3dsmax.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration 3dsmax
-import bpy
-
-bpy.context.user_preferences.edit.use_drag_immediately = False
-bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb = False
-bpy.context.user_preferences.view.use_auto_perspective = True
-bpy.context.user_preferences.view.use_quit_dialog = True
-bpy.context.user_preferences.inputs.select_mouse = 'LEFT'
-bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY'
-bpy.context.user_preferences.inputs.view_zoom_axis = 'VERTICAL'
-bpy.context.user_preferences.inputs.view_rotate_method = 'TURNTABLE'
-bpy.context.user_preferences.inputs.invert_mouse_zoom = False
diff --git a/release/scripts/presets/interaction/blender.py b/release/scripts/presets/interaction/blender.py
deleted file mode 100644
index 0c79a3fc909..00000000000
--- a/release/scripts/presets/interaction/blender.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration Blender
-import bpy
-
-bpy.context.user_preferences.view.use_mouse_depth_cursor = False
-bpy.context.user_preferences.view.use_mouse_depth_navigate = False
-bpy.context.user_preferences.view.use_zoom_to_mouse = False
-bpy.context.user_preferences.view.use_rotate_around_active = False
-bpy.context.user_preferences.edit.use_drag_immediately = False
-bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb = False
-bpy.context.user_preferences.inputs.select_mouse = 'RIGHT'
-bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY'
-bpy.context.user_preferences.inputs.view_zoom_axis = 'VERTICAL'
-bpy.context.user_preferences.inputs.view_rotate_method = 'TURNTABLE'
-bpy.context.user_preferences.inputs.invert_mouse_zoom = False
diff --git a/release/scripts/presets/interaction/maya.py b/release/scripts/presets/interaction/maya.py
deleted file mode 100644
index 059669d6482..00000000000
--- a/release/scripts/presets/interaction/maya.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration Blender
-import bpy
-
-bpy.context.user_preferences.edit.use_drag_immediately = True
-bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb = False
-bpy.context.user_preferences.inputs.select_mouse = 'LEFT'
-bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY'
-bpy.context.user_preferences.inputs.view_zoom_axis = 'HORIZONTAL'
-bpy.context.user_preferences.inputs.view_rotate_method = 'TURNTABLE'
-bpy.context.user_preferences.inputs.invert_mouse_zoom = False
diff --git a/release/scripts/presets/interface_theme/24x_blues.xml b/release/scripts/presets/interface_theme/24x_blues.xml
deleted file mode 100644
index 36cfeeb5980..00000000000
--- a/release/scripts/presets/interface_theme/24x_blues.xml
+++ /dev/null
@@ -1,1177 +0,0 @@
-<bpy>
- <Theme>
- <user_interface>
- <ThemeUserInterface menu_shadow_fac="0.444043"
- menu_shadow_width="12"
- icon_file=""
- icon_alpha="1"
- widget_emboss="#ffffff05"
- axis_x="#dc0000"
- axis_y="#00dc00"
- axis_z="#0000dc">
- <wcol_regular>
- <ThemeWidgetColors outline="#616161"
- inner="#999999ff"
- inner_sel="#646464ff"
- item="#191919ff"
- text="#000000"
- text_sel="#ffffff"
- show_shaded="TRUE"
- shadetop="10"
- shadedown="-10">
- </ThemeWidgetColors>
- </wcol_regular>
- <wcol_tool>
- <ThemeWidgetColors outline="#262626"
- inner="#b2bec6ff"
- inner_sel="#646464ff"
- item="#191919ff"
- text="#000000"
- text_sel="#ffffff"
- show_shaded="TRUE"
- shadetop="10"
- shadedown="-10">
- </ThemeWidgetColors>
- </wcol_tool>
- <wcol_radio>
- <ThemeWidgetColors outline="#262626"
- inner="#d0d0d0ff"
- inner_sel="#667677ff"
- item="#ffffffff"
- text="#000000"
- text_sel="#ffffff"
- show_shaded="TRUE"
- shadetop="10"
- shadedown="-10">
- </ThemeWidgetColors>
- </wcol_radio>
- <wcol_text>
- <ThemeWidgetColors outline="#262626"
- inner="#b2bec6ff"
- inner_sel="#999999ff"
- item="#5a5a5aff"
- text="#000000"
- text_sel="#ffffff"
- show_shaded="TRUE"
- shadetop="0"
- shadedown="10">
- </ThemeWidgetColors>
- </wcol_text>
- <wcol_option>
- <ThemeWidgetColors outline="#262626"
- inner="#aababbff"
- inner_sel="#667677ff"
- item="#ffffffff"
- text="#000000"
- text_sel="#000000"
- show_shaded="TRUE"
- shadetop="10"
- shadedown="-10">
- </ThemeWidgetColors>
- </wcol_option>
- <wcol_toggle>
- <ThemeWidgetColors outline="#262626"
- inner="#d0d0d0ff"
- inner_sel="#7d7d7dff"
- item="#191919ff"
- text="#000000"
- text_sel="#ffffff"
- show_shaded="TRUE"
- shadetop="15"
- shadedown="-15">
- </ThemeWidgetColors>
- </wcol_toggle>
- <wcol_num>
- <ThemeWidgetColors outline="#262626"
- inner="#a1a1a1a4"
- inner_sel="#999999ff"
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list