[Bf-blender-cvs] [da2e53c9e72] filebrowser_redesign: Merge 'master' into 'filebrowser_redesign'
Julian Eisel
noreply at git.blender.org
Wed Apr 24 15:16:48 CEST 2019
Commit: da2e53c9e72cc76ed3026026a924437b2c8889fa
Author: Julian Eisel
Date: Fri Apr 19 22:11:25 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rBda2e53c9e72cc76ed3026026a924437b2c8889fa
Merge 'master' into 'filebrowser_redesign'
===================================================================
===================================================================
diff --cc release/datafiles/locale
index 199b3a7c2f0,199b3a7c2f0..2b81e2acc01
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 199b3a7c2f03a3af6f612e092d3359f7b6f288cc
++Subproject commit 2b81e2acc011a8b79232a18dad3c00b8e654ceee
diff --cc release/scripts/addons
index 3683429de05,3683429de05..e4165cee8b3
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 3683429de050b8026835d17ae7288a436c31cdb6
++Subproject commit e4165cee8b34b216db5ff41b20b9a05991a4b4b7
diff --cc source/blender/blenloader/intern/versioning_userdef.c
index 9a777296792,bf88eddc145..e75fcfb1e88
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@@ -47,76 -46,72 +46,76 @@@ static void do_versions_theme(UserDef *
{
#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(userdef, ver, subver)
- if (!USER_VERSION_ATLEAST(280, 20)) {
- memcpy(btheme, &U_theme_default, sizeof(*btheme));
- }
+ if (!USER_VERSION_ATLEAST(280, 20)) {
+ memcpy(btheme, &U_theme_default, sizeof(*btheme));
+ }
- #define FROM_DEFAULT_V4_UCHAR(member) \
- copy_v4_v4_char(btheme->member, U_theme_default.member)
+ #define FROM_DEFAULT_V4_UCHAR(member) copy_v4_v4_char(btheme->member, U_theme_default.member)
- if (!USER_VERSION_ATLEAST(280, 25)) {
- copy_v4_v4_char(btheme->space_action.anim_preview_range, btheme->space_action.anim_active);
- copy_v4_v4_char(btheme->space_nla.anim_preview_range, btheme->space_nla.anim_active);
- copy_v4_v4_char(btheme->space_graph.anim_preview_range, btheme->space_action.anim_active);
- }
-
- if (!USER_VERSION_ATLEAST(280, 26)) {
- FROM_DEFAULT_V4_UCHAR(tui.icon_collection);
- FROM_DEFAULT_V4_UCHAR(tui.icon_object);
- FROM_DEFAULT_V4_UCHAR(tui.icon_object_data);
- FROM_DEFAULT_V4_UCHAR(tui.icon_modifier);
- FROM_DEFAULT_V4_UCHAR(tui.icon_shading);
- }
-
- if (!USER_VERSION_ATLEAST(280, 27)) {
- FROM_DEFAULT_V4_UCHAR(space_action.shade2);
- FROM_DEFAULT_V4_UCHAR(space_action.hilite);
- FROM_DEFAULT_V4_UCHAR(space_action.group);
- FROM_DEFAULT_V4_UCHAR(space_action.group_active);
- FROM_DEFAULT_V4_UCHAR(space_action.strip_select);
- FROM_DEFAULT_V4_UCHAR(space_action.ds_channel);
- FROM_DEFAULT_V4_UCHAR(space_action.ds_subchannel);
- FROM_DEFAULT_V4_UCHAR(space_action.keytype_movehold);
- FROM_DEFAULT_V4_UCHAR(space_action.keytype_movehold_select);
- }
-
- if (!USER_VERSION_ATLEAST(280, 28)) {
- FROM_DEFAULT_V4_UCHAR(space_action.ds_ipoline);
- }
-
- if (!USER_VERSION_ATLEAST(280, 29)) {
- FROM_DEFAULT_V4_UCHAR(space_properties.navigation_bar);
- }
- if (!USER_VERSION_ATLEAST(280, 31)) {
- FROM_DEFAULT_V4_UCHAR(space_clip.list_text);
- }
-
- if (!USER_VERSION_ATLEAST(280, 36)) {
- FROM_DEFAULT_V4_UCHAR(tui.wcol_state.inner_changed);
- FROM_DEFAULT_V4_UCHAR(tui.wcol_state.inner_changed_sel);
- }
-
- if (!USER_VERSION_ATLEAST(280, 39)) {
- FROM_DEFAULT_V4_UCHAR(space_clip.metadatabg);
- FROM_DEFAULT_V4_UCHAR(space_clip.metadatatext);
- }
-
- if (!USER_VERSION_ATLEAST(280, 40)) {
- FROM_DEFAULT_V4_UCHAR(space_preferences.navigation_bar);
+ if (!USER_VERSION_ATLEAST(280, 25)) {
+ copy_v4_v4_char(btheme->space_action.anim_preview_range, btheme->space_action.anim_active);
+ copy_v4_v4_char(btheme->space_nla.anim_preview_range, btheme->space_nla.anim_active);
+ copy_v4_v4_char(btheme->space_graph.anim_preview_range, btheme->space_action.anim_active);
+ }
+
+ if (!USER_VERSION_ATLEAST(280, 26)) {
+ FROM_DEFAULT_V4_UCHAR(tui.icon_collection);
+ FROM_DEFAULT_V4_UCHAR(tui.icon_object);
+ FROM_DEFAULT_V4_UCHAR(tui.icon_object_data);
+ FROM_DEFAULT_V4_UCHAR(tui.icon_modifier);
+ FROM_DEFAULT_V4_UCHAR(tui.icon_shading);
+ }
+
+ if (!USER_VERSION_ATLEAST(280, 27)) {
+ FROM_DEFAULT_V4_UCHAR(space_action.shade2);
+ FROM_DEFAULT_V4_UCHAR(space_action.hilite);
+ FROM_DEFAULT_V4_UCHAR(space_action.group);
+ FROM_DEFAULT_V4_UCHAR(space_action.group_active);
+ FROM_DEFAULT_V4_UCHAR(space_action.strip_select);
+ FROM_DEFAULT_V4_UCHAR(space_action.ds_channel);
+ FROM_DEFAULT_V4_UCHAR(space_action.ds_subchannel);
+ FROM_DEFAULT_V4_UCHAR(space_action.keytype_movehold);
+ FROM_DEFAULT_V4_UCHAR(space_action.keytype_movehold_select);
+ }
+
+ if (!USER_VERSION_ATLEAST(280, 28)) {
+ FROM_DEFAULT_V4_UCHAR(space_action.ds_ipoline);
+ }
+
+ if (!USER_VERSION_ATLEAST(280, 29)) {
+ FROM_DEFAULT_V4_UCHAR(space_properties.navigation_bar);
+ }
+ if (!USER_VERSION_ATLEAST(280, 31)) {
+ FROM_DEFAULT_V4_UCHAR(space_clip.list_text);
+ }
+
+ if (!USER_VERSION_ATLEAST(280, 36)) {
+ FROM_DEFAULT_V4_UCHAR(tui.wcol_state.inner_changed);
+ FROM_DEFAULT_V4_UCHAR(tui.wcol_state.inner_changed_sel);
+ }
+
+ if (!USER_VERSION_ATLEAST(280, 39)) {
+ FROM_DEFAULT_V4_UCHAR(space_clip.metadatabg);
+ FROM_DEFAULT_V4_UCHAR(space_clip.metadatatext);
+ }
+
+ if (!USER_VERSION_ATLEAST(280, 40)) {
+ FROM_DEFAULT_V4_UCHAR(space_preferences.navigation_bar);
- copy_v4_v4_char(btheme->space_preferences.execution_buts, btheme->space_preferences.navigation_bar);
+ copy_v4_v4_char(btheme->space_preferences.execution_buts,
+ btheme->space_preferences.navigation_bar);
- }
+ }
- if (!USER_VERSION_ATLEAST(280, 41)) {
- FROM_DEFAULT_V4_UCHAR(space_view3d.back);
- }
+ if (!USER_VERSION_ATLEAST(280, 41)) {
+ FROM_DEFAULT_V4_UCHAR(space_view3d.back);
+ }
- if (!USER_VERSION_ATLEAST(280, 52)) {
- FROM_DEFAULT_V4_UCHAR(space_info.info_info);
- }
+ if (!USER_VERSION_ATLEAST(280, 52)) {
+ FROM_DEFAULT_V4_UCHAR(space_info.info_info);
+ }
+
+ if (!USER_VERSION_ATLEAST(280, 54)) {
+ FROM_DEFAULT_V4_UCHAR(space_file.execution_buts);
+ }
#undef FROM_DEFAULT_V4_UCHAR
@@@ -128,22 -123,31 +127,31 @@@
static void do_version_select_mouse(UserDef *userdef, wmKeyMapItem *kmi)
{
- /* Remove select/action mouse from user defined keymaps. */
- enum {
- ACTIONMOUSE = 0x0005,
- SELECTMOUSE = 0x0006,
- EVT_TWEAK_A = 0x5005,
- EVT_TWEAK_S = 0x5006,
- };
- const bool left = (userdef->flag & USER_LMOUSESELECT) != 0;
-
- switch (kmi->type) {
+ /* Remove select/action mouse from user defined keymaps. */
+ enum {
+ ACTIONMOUSE = 0x0005,
+ SELECTMOUSE = 0x0006,
+ EVT_TWEAK_A = 0x5005,
+ EVT_TWEAK_S = 0x5006,
+ };
+ const bool left = (userdef->flag & USER_LMOUSESELECT) != 0;
+
+ switch (kmi->type) {
- case SELECTMOUSE: kmi->type = (left) ? LEFTMOUSE : RIGHTMOUSE; break;
- case ACTIONMOUSE: kmi->type = (left) ? RIGHTMOUSE : LEFTMOUSE; break;
- case EVT_TWEAK_S: kmi->type = (left) ? EVT_TWEAK_L : EVT_TWEAK_R; break;
- case EVT_TWEAK_A: kmi->type = (left) ? EVT_TWEAK_R : EVT_TWEAK_L; break;
- default: break;
+ case SELECTMOUSE:
+ kmi->type = (left) ? LEFTMOUSE : RIGHTMOUSE;
+ break;
+ case ACTIONMOUSE:
+ kmi->type = (left) ? RIGHTMOUSE : LEFTMOUSE;
+ break;
+ case EVT_TWEAK_S:
+ kmi->type = (left) ? EVT_TWEAK_L : EVT_TWEAK_R;
+ break;
+ case EVT_TWEAK_A:
+ kmi->type = (left) ? EVT_TWEAK_R : EVT_TWEAK_L;
+ break;
+ default:
+ break;
- }
+ }
}
/* patching UserDef struct and Themes */
@@@ -152,365 -156,358 +160,358 @@@ void BLO_version_defaults_userpref_blen
#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(bmain, ver, subver)
- /* the UserDef struct is not corrected with do_versions() .... ugh! */
+ /* the UserDef struct is not corrected with do_versions() .... ugh! */
- if (userdef->wheellinescroll == 0) userdef->wheellinescroll = 3;
+ if (userdef->wheellinescroll == 0)
+ userdef->wheellinescroll = 3;
- if (userdef->menuthreshold1 == 0) {
- userdef->menuthreshold1 = 5;
- userdef->menuthreshold2 = 2;
- }
+ if (userdef->menuthreshold1 == 0) {
+ userdef->menuthreshold1 = 5;
+ userdef->menuthreshold2 = 2;
+ }
- if (userdef->mixbufsize == 0) userdef->mixbufsize = 2048;
+ if (userdef->mixbufsize == 0)
+ userdef->mixbufsize = 2048;
- if (userdef->autokey_mode == 0) {
- /* 'add/replace' but not on */
- userdef->autokey_mode = 2;
- }
- if (userdef->savetime <= 0) {
- userdef->savetime = 1;
- // XXX error(STRINGIFY(BLENDER_STARTUP_FILE)" is buggy, please consider removing it.\n");
- }
- if (userdef->gizmo_size == 0) {
- userdef->gizmo_size = 75;
- userdef->gizmo_flag |= USER_GIZMO_DRAW;
- }
- if (userdef->pad_rot_angle == 0.0f)
- userdef->pad_rot_angle = 15.0f;
-
- /* graph editor - unselected F-Curve visibility */
- if (userdef->fcu_inactive_alpha == 0) {
- userdef->fcu_inactive_alpha = 0.25f;
- }
-
- if (!USER_VERSION_ATLEAST(192, 0)) {
- strcpy(userdef->sounddir, "/");
- }
-
- /* patch to set Dupli Armature */
- if (!USER_VERSION_ATLEAST(220, 0)) {
- userdef->dupflag |= USER_DUP_ARM;
- }
-
- /* added seam, normal color, undo */
- if (!USER_VERSION_ATLEAST(235, 0)) {
- userdef->uiflag |= USER_GLOBALUNDO;
+ if (userdef->autokey_mode == 0) {
+ /* 'add/replace' but not on */
+ userdef->autokey_mode = 2;
+ }
+ if (userdef->savetime <= 0) {
+ userdef->savetime = 1;
+// XXX error(STRINGIFY(BLENDER_STARTUP_FILE)" is buggy, please consider removing it.\n");
+ }
+ if (userdef->gizmo_size == 0) {
+ userdef->gizmo_size = 75;
+ userdef->gizmo_flag |= USER_GIZMO_DRAW;
+ }
+ if (userdef->pad_rot_angle == 0.0f)
+ userdef->pad_rot_angle = 15.0f;
+
+ /* graph editor - unselected F-Curve visibility */
+ if (userdef->fcu_inactive_alpha == 0) {
+ userdef->fcu_inactive_alpha = 0.25f;
+ }
+
+ if (!USER_VERSION_ATLEAST(192, 0)) {
+ strcpy(userdef->sounddir, "/");
+ }
+
+ /* patch to set Dupli Armature */
+ if (!USER_VERSION_ATLEAST(220, 0)) {
+ userdef->dupflag |= USER_DUP_ARM;
+ }
+
+ /* added seam, normal color, undo */
+ if (!USER_VERSION_ATLEAST(235, 0)) {
+ userdef->uiflag |= USER_GLOBALUNDO;
- if (userdef->undosteps == 0) userdef->undosteps = 32;
+ if (userdef->undosteps == 0)
+ userdef->undosteps = 32;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list