diff options
Diffstat (limited to 'release')
| -rw-r--r-- | release/darwin/buildbot/background.tif | bin | 0 -> 20286 bytes | |||
| -rwxr-xr-x | release/darwin/bundle.sh | 5 | ||||
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_empty.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_topbar.py | 2 |
7 files changed, 7 insertions, 1 deletions
diff --git a/release/darwin/buildbot/background.tif b/release/darwin/buildbot/background.tif Binary files differnew file mode 100644 index 00000000000..5253a6bf439 --- /dev/null +++ b/release/darwin/buildbot/background.tif diff --git a/release/darwin/bundle.sh b/release/darwin/bundle.sh index b0f489e6fc2..91ce4f61d37 100755 --- a/release/darwin/bundle.sh +++ b/release/darwin/bundle.sh @@ -54,6 +54,11 @@ while [[ $# -gt 0 ]]; do shift shift ;; + --background-image) + _background_image="$2" + shift + shift + ;; -h|--help) echo "Usage:" echo " $(basename "$0") --source DIR --dmg IMAGENAME " diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 61cb42387d1356c168d0e89acaef44a5e365520 +Subproject 6a6b84fd50538a65276c729b5d396be615bc79f diff --git a/release/scripts/addons b/release/scripts/addons -Subproject cbb11b1a597366deabfa1cac11989621bf9075c +Subproject 8d11c9e82893e231b2abc093d815deb79866e03 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject e479f81053badb6548ca9cb8a6f2b22e0a242cb +Subproject 2769f4b5f5f4769cf9115fa7cdd1287540a795b diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py index 6650aef61aa..4ce87b85410 100644 --- a/release/scripts/startup/bl_ui/properties_data_empty.py +++ b/release/scripts/startup/bl_ui/properties_data_empty.py @@ -60,6 +60,7 @@ class DATA_PT_empty(DataButtonsPanel, Panel): col.row().prop(ob, "empty_image_side", text="Side", expand=True) col.prop(ob, "show_empty_image_orthographic", text="Display Orthographic") col.prop(ob, "show_empty_image_perspective", text="Display Perspective") + col.prop(ob, "show_empty_image_only_axis_aligned") class DATA_PT_empty_image(DataButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 836ec53e2e5..f66a363e6ca 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -349,7 +349,7 @@ class TOPBAR_MT_app_about(Menu): layout.separator() layout.operator("wm.url_open_preset", text="Blender Website", icon='URL').type = 'BLENDER' - layout.operator("wm.url_open", text="Credits", icon='URL').type = 'CREDITS' + layout.operator("wm.url_open_preset", text="Credits", icon='URL').type = 'CREDITS' layout.separator() |