diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-19 05:49:58 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-19 05:49:58 +0400 |
| commit | d433cd65f7127d60e17d05a824290423ad226eae (patch) | |
| tree | f0a9c821f6046e97b74c6969d41269b558fd52ab /release/scripts | |
| parent | 10f0f66560234a04aed3295c74fff20adacbc57f (diff) | |
| parent | f10dea7e3b9b431edae9c787fa1a9e09cd567ed7 (diff) | |
Merged changes in the trunk up to revision 53146.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'release/scripts')
19 files changed, 927 insertions, 221 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py index c7414e84046..fabc2306c41 100644 --- a/release/scripts/modules/bl_i18n_utils/settings.py +++ b/release/scripts/modules/bl_i18n_utils/settings.py @@ -80,6 +80,7 @@ LANGUAGES = ( (34, "Estonian (Eestlane)", "et_EE"), (35, "Esperanto (Esperanto)", "eo"), (36, "Spanish from Spain (Español de España)", "es_ES"), + (37, "Amharic (አማáˆáŠ›)", "am_ET"), ) # Name of language file used by Blender to generate translations' menu. diff --git a/release/scripts/modules/bl_i18n_utils/spell_check_utils.py b/release/scripts/modules/bl_i18n_utils/spell_check_utils.py index fbe405a61c6..049ec9ca969 100644 --- a/release/scripts/modules/bl_i18n_utils/spell_check_utils.py +++ b/release/scripts/modules/bl_i18n_utils/spell_check_utils.py @@ -385,6 +385,7 @@ dict_uimsgs = { "vinterlace", "wetmap", "wetmaps", "wpaint", + "uvwarp", # Algorithm names "beckmann", diff --git a/release/scripts/modules/rna_xml.py b/release/scripts/modules/rna_xml.py index e21ccd08a35..08b60ebc6f8 100644 --- a/release/scripts/modules/rna_xml.py +++ b/release/scripts/modules/rna_xml.py @@ -265,7 +265,15 @@ def xml2rna(root_xml, tp_name = 'ARRAY' # print(" %s.%s (%s) --- %s" % (type(value).__name__, attr, tp_name, subvalue_type)) - setattr(value, attr, value_xml_coerce) + try: + setattr(value, attr, value_xml_coerce) + except ValueError: + # size mismatch + val = getattr(value, attr) + if len(val) < len(value_xml_coerce): + setattr(value, attr, value_xml_coerce[:len(val)]) + else: + setattr(value, attr, list(value_xml_coerce) + list(val)[len(value_xml_coerce):]) # --------------------------------------------------------------------- # Complex attributes diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml index 0a77aa132a8..18a3e539738 100644 --- a/release/scripts/presets/interface_theme/back_to_black.xml +++ b/release/scripts/presets/interface_theme/back_to_black.xml @@ -220,16 +220,10 @@ blend="0.1"> </ThemeWidgetStateColors> </wcol_state> - <panel> - <ThemePanelColors header="#000000ff" - show_header="FALSE"> - </ThemePanelColors> - </panel> </ThemeUserInterface> </user_interface> <view_3d> <ThemeView3D grid="#222222" - panel="#a5a5a57f" wire="#888888" lamp="#c1d40028" speaker="#535353" @@ -288,17 +282,23 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#00000057" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeView3D> </view_3d> <graph_editor> <ThemeGraphEditor grid="#262626" - panel="#ffffff" window_sliders="#969696" channels_region="#6d6d6d" vertex="#ffffff" @@ -331,10 +331,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -348,7 +355,6 @@ </graph_editor> <file_browser> <ThemeFileBrowser selected_file="#354d66" - tiles="#343434" scrollbar="#a0a0a0" scroll_handle="#7f7070" active_file="#b1b1b1" @@ -361,10 +367,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -400,10 +413,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c3c3c3" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -437,10 +457,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -476,10 +503,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeImageEditor> @@ -507,16 +541,23 @@ header="#000000" header_text="#f3f3f3" header_text_hi="#ffffff" - button="#020202" + button="#02020242" button_title="#bdbdbd" button_text="#dddddd" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeSequenceEditor> </sequence_editor> <properties> - <ThemeProperties panel="#828282"> + <ThemeProperties> <space> <ThemeSpaceGeneric back="#000000" title="#5d5d5d" @@ -525,10 +566,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeProperties> @@ -550,10 +598,17 @@ header="#000000" header_text="#b9b9b9" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#d8d8d8" button_text="#cccccc" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeTextEditor> @@ -569,10 +624,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeTimeline> @@ -598,10 +660,17 @@ header="#000000" header_text="#c7c7c7" header_text_hi="#ffffff" - button="#000000" + button="#0000002f" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -614,7 +683,7 @@ </ThemeNodeEditor> </node_editor> <logic_editor> - <ThemeLogicEditor panel="#a5a5a5"> + <ThemeLogicEditor> <space> <ThemeSpaceGeneric back="#070707" title="#5d5d5d" @@ -623,10 +692,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeLogicEditor> @@ -642,10 +718,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeOutliner> @@ -660,10 +743,17 @@ header="#000000" header_text="#adadad" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeInfo> @@ -678,10 +768,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeUserPreferences> @@ -700,10 +797,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#000000" + button="#000000ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeConsole> @@ -732,10 +836,17 @@ header="#000000" header_text="#979797" header_text_hi="#ffffff" - button="#070707" + button="#070707ff" button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml index 18ae3072208..5ad7c502cc7 100644 --- a/release/scripts/presets/interface_theme/blender_24x.xml +++ b/release/scripts/presets/interface_theme/blender_24x.xml @@ -220,16 +220,10 @@ blend="0.5"> </ThemeWidgetStateColors> </wcol_state> - <panel> - <ThemePanelColors header="#00000019" - show_header="FALSE"> - </ThemePanelColors> - </panel> </ThemeUserInterface> </user_interface> <view_3d> <ThemeView3D grid="#5c5c5c" - panel="#a5a5a5ff" wire="#000000" lamp="#00000028" speaker="#000000" @@ -288,17 +282,23 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b457" button_title="#5a5a5a" button_text="#5a5a5a" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeView3D> </view_3d> <graph_editor> <ThemeGraphEditor grid="#818181" - panel="#ffffff" window_sliders="#969696" channels_region="#707070" vertex="#000000" @@ -331,10 +331,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#727272" + button="#727272ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -348,7 +355,6 @@ </graph_editor> <file_browser> <ThemeFileBrowser selected_file="#a0a0d0" - tiles="#b4b4b4" scrollbar="#a0a0a0" scroll_handle="#7f7070" active_file="#828282" @@ -361,10 +367,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -400,10 +413,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -437,10 +457,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -476,10 +503,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeImageEditor> @@ -507,16 +541,23 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b442" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeSequenceEditor> </sequence_editor> <properties> - <ThemeProperties panel="#828282"> + <ThemeProperties> <space> <ThemeSpaceGeneric back="#b4b4b4" title="#000000" @@ -525,10 +566,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeProperties> @@ -550,10 +598,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeTextEditor> @@ -569,10 +624,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeTimeline> @@ -598,10 +660,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b42f" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -614,7 +683,7 @@ </ThemeNodeEditor> </node_editor> <logic_editor> - <ThemeLogicEditor panel="#a5a5a5"> + <ThemeLogicEditor> <space> <ThemeSpaceGeneric back="#b4b4b4" title="#000000" @@ -623,10 +692,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeLogicEditor> @@ -642,10 +718,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeOutliner> @@ -660,10 +743,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeInfo> @@ -678,10 +768,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeUserPreferences> @@ -700,10 +797,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeConsole> @@ -732,10 +836,17 @@ header="#b4b4b4" header_text="#000000" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> diff --git a/release/scripts/presets/interface_theme/elsyiun.xml b/release/scripts/presets/interface_theme/elsyiun.xml index c10eb108000..0daadcd41d3 100644 --- a/release/scripts/presets/interface_theme/elsyiun.xml +++ b/release/scripts/presets/interface_theme/elsyiun.xml @@ -220,16 +220,10 @@ blend="0.5"> </ThemeWidgetStateColors> </wcol_state> - <panel> - <ThemePanelColors header="#00000019" - show_header="FALSE"> - </ThemePanelColors> - </panel> </ThemeUserInterface> </user_interface> <view_3d> <ThemeView3D grid="#585858" - panel="#a5a5a57f" wire="#000000" lamp="#00000028" speaker="#000000" @@ -288,17 +282,23 @@ header="#3b3b3b" header_text="#b9b9b9" header_text_hi="#ffffff" - button="#3b3b3b" + button="#3b3b3b57" button_title="#979797" button_text="#979797" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeView3D> </view_3d> <graph_editor> <ThemeGraphEditor grid="#585858" - panel="#ffffff" window_sliders="#969696" channels_region="#707070" vertex="#000000" @@ -331,10 +331,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#3b3b3b" + button="#3b3b3bff" button_title="#8b8b8b" button_text="#8b8b8b" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -348,7 +355,6 @@ </graph_editor> <file_browser> <ThemeFileBrowser selected_file="#755129" - tiles="#3b3b3b" scrollbar="#a0a0a0" scroll_handle="#7f7070" active_file="#828282" @@ -361,10 +367,17 @@ header="#3b3b3b" header_text="#8b8b8b" header_text_hi="#ffffff" - button="#303030" + button="#303030ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -400,10 +413,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#3b3b3b" + button="#3b3b3bff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -437,10 +457,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#aaaaaa" + button="#aaaaaaff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -476,10 +503,17 @@ header="#303030" header_text="#000000" header_text_hi="#ffffff" - button="#303030" + button="#303030ff" button_title="#8b8b8b" button_text="#8b8b8b" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeImageEditor> @@ -507,16 +541,23 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#3b3b3b" + button="#3b3b3b42" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeSequenceEditor> </sequence_editor> <properties> - <ThemeProperties panel="#828282"> + <ThemeProperties> <space> <ThemeSpaceGeneric back="#3b3b3b" title="#979797" @@ -525,10 +566,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#727272" + button="#727272ff" button_title="#b8b8b8" button_text="#b8b8b8" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeProperties> @@ -550,10 +598,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#3b3b3b" + button="#3b3b3bff" button_title="#8b8b8b" button_text="#8b8b8b" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeTextEditor> @@ -569,10 +624,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#727272" + button="#727272ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeTimeline> @@ -598,10 +660,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#3b3b3b" + button="#3b3b3b2f" button_title="#8b8b8b" button_text="#8b8b8b" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -614,7 +683,7 @@ </ThemeNodeEditor> </node_editor> <logic_editor> - <ThemeLogicEditor panel="#3b3b3b"> + <ThemeLogicEditor> <space> <ThemeSpaceGeneric back="#3b3b3b" title="#000000" @@ -623,10 +692,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#3b3b3b" + button="#3b3b3bff" button_title="#8b8b8b" button_text="#8b8b8b" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeLogicEditor> @@ -642,10 +718,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#727272" + button="#727272ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeOutliner> @@ -660,10 +743,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#000000" - button="#3b3b3b" + button="#3b3b3bff" button_title="#000000" button_text="#000000" button_text_hi="#000000"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeInfo> @@ -678,10 +768,17 @@ header="#3b3b3b" header_text="#000000" header_text_hi="#ffffff" - button="#727272" + button="#727272ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeUserPreferences> @@ -700,10 +797,17 @@ header="#303030" header_text="#000000" header_text_hi="#ffffff" - button="#3b3b3b" + button="#3b3b3bff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeConsole> @@ -732,10 +836,17 @@ header="#313131" header_text="#000000" header_text_hi="#ffffff" - button="#3b3b3b" + button="#3b3b3bff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="FALSE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> diff --git a/release/scripts/presets/interface_theme/hexagon.xml b/release/scripts/presets/interface_theme/hexagon.xml index ad514bbbafa..932bd52a4e9 100644 --- a/release/scripts/presets/interface_theme/hexagon.xml +++ b/release/scripts/presets/interface_theme/hexagon.xml @@ -220,16 +220,10 @@ blend="0.5"> </ThemeWidgetStateColors> </wcol_state> - <panel> - <ThemePanelColors header="#00000019" - show_header="TRUE"> - </ThemePanelColors> - </panel> </ThemeUserInterface> </user_interface> <view_3d> <ThemeView3D grid="#5e5e83" - panel="#a5a5a5ff" wire="#000000" lamp="#00000028" speaker="#000000" @@ -288,17 +282,23 @@ header="#646875" header_text="#000000" header_text_hi="#ffffff" - button="#6c717f" + button="#6c717f57" button_title="#eaeaea" button_text="#d7d7d7" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeView3D> </view_3d> <graph_editor> <ThemeGraphEditor grid="#58587c" - panel="#ffffff" window_sliders="#969696" channels_region="#707070" vertex="#000000" @@ -331,10 +331,17 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#646875" + button="#646875ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -348,7 +355,6 @@ </graph_editor> <file_browser> <ThemeFileBrowser selected_file="#69a5be" - tiles="#5c606c" scrollbar="#a0a0a0" scroll_handle="#7f7070" active_file="#859cb9" @@ -361,10 +367,17 @@ header="#5c606c" header_text="#dddddd" header_text_hi="#ffffff" - button="#6c717f" + button="#6c717fff" button_title="#d7d7d7" button_text="#d7d7d7" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -400,10 +413,17 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#646875" + button="#646875ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -437,10 +457,17 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#6c717f" + button="#6c717fff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -476,10 +503,17 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#646875" + button="#646875ff" button_title="#eeeeee" button_text="#eeeeee" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeImageEditor> @@ -507,16 +541,23 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#646875" + button="#64687542" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeSequenceEditor> </sequence_editor> <properties> - <ThemeProperties panel="#828282"> + <ThemeProperties> <space> <ThemeSpaceGeneric back="#646875" title="#ffffff" @@ -525,10 +566,17 @@ header="#646875" header_text="#000000" header_text_hi="#ffffff" - button="#727272" + button="#727272ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeProperties> @@ -550,10 +598,17 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#646875" + button="#646875ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeTextEditor> @@ -569,10 +624,17 @@ header="#565863" header_text="#000000" header_text_hi="#ffffff" - button="#5a5e6a" + button="#5a5e6aff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeTimeline> @@ -598,10 +660,17 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#646875" + button="#6468752f" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -614,7 +683,7 @@ </ThemeNodeEditor> </node_editor> <logic_editor> - <ThemeLogicEditor panel="#a5a5a5"> + <ThemeLogicEditor> <space> <ThemeSpaceGeneric back="#7c7e88" title="#000000" @@ -623,10 +692,17 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#6c717f" + button="#6c717fff" button_title="#d7d7d7" button_text="#d7d7d7" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeLogicEditor> @@ -642,10 +718,17 @@ header="#6c717f" header_text="#000000" header_text_hi="#ffffff" - button="#727272" + button="#727272ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeOutliner> @@ -660,10 +743,17 @@ header="#646875" header_text="#dddddd" header_text_hi="#ffffff" - button="#b4b4b4" + button="#b4b4b4ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeInfo> @@ -678,10 +768,17 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#6c717f" + button="#6c717fff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeUserPreferences> @@ -700,10 +797,17 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#6c717f" + button="#6c717fff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeConsole> @@ -732,10 +836,17 @@ header="#5c606c" header_text="#000000" header_text_hi="#ffffff" - button="#646875" + button="#646875ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000019" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml index 8f4a42b6ab7..8be83cbde23 100644 --- a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml +++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml @@ -220,16 +220,10 @@ blend="0.1"> </ThemeWidgetStateColors> </wcol_state> - <panel> - <ThemePanelColors header="#00000000" - show_header="TRUE"> - </ThemePanelColors> - </panel> </ThemeUserInterface> </user_interface> <view_3d> <ThemeView3D grid="#3c3b37" - panel="#a5a5a57f" wire="#93237f" lamp="#ffffff34" speaker="#93237f" @@ -288,17 +282,23 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b3757" button_title="#9c9c9c" button_text="#9c9c9c" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeView3D> </view_3d> <graph_editor> <ThemeGraphEditor grid="#3c3b37" - panel="#ffffff" window_sliders="#95948f" channels_region="#707070" vertex="#ffffff" @@ -331,10 +331,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b37ff" button_title="#9c9c9c" button_text="#9c9c9c" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -348,7 +355,6 @@ </graph_editor> <file_browser> <ThemeFileBrowser selected_file="#6b395a" - tiles="#3c3b37" scrollbar="#a0a0a0" scroll_handle="#7f7070" active_file="#eeedeb" @@ -361,10 +367,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#727272" + button="#727272ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -400,10 +413,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b37ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -437,10 +457,17 @@ header="#464541" header_text="#cacaca" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b37ff" button_title="#9c9c9c" button_text="#9c9c9c" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -476,10 +503,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b37ff" button_title="#b1b1b1" button_text="#b9b9b9" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeImageEditor> @@ -507,16 +541,23 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b3742" button_title="#acacac" button_text="#acacac" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeSequenceEditor> </sequence_editor> <properties> - <ThemeProperties panel="#3c3b37"> + <ThemeProperties> <space> <ThemeSpaceGeneric back="#3c3b37" title="#acacac" @@ -525,10 +566,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b37ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeProperties> @@ -550,10 +598,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#191919" + button="#191919ff" button_title="#64645e" button_text="#95948f" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeTextEditor> @@ -569,10 +624,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b37ff" button_title="#9c9c9c" button_text="#9c9c9c" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeTimeline> @@ -598,10 +660,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#353430" + button="#3534302f" button_title="#acacac" button_text="#acacac" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> @@ -614,7 +683,7 @@ </ThemeNodeEditor> </node_editor> <logic_editor> - <ThemeLogicEditor panel="#acacac"> + <ThemeLogicEditor> <space> <ThemeSpaceGeneric back="#29001b" title="#000000" @@ -623,10 +692,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#353430" + button="#353430ff" button_title="#7d7d7d" button_text="#acacac" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeLogicEditor> @@ -642,10 +718,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b37ff" button_title="#000000" button_text="#000000" button_text_hi="#f47421"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeOutliner> @@ -660,10 +743,17 @@ header="#464541" header_text="#ffffff" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b37ff" button_title="#eeedeb" button_text="#eeedeb" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeInfo> @@ -678,10 +768,17 @@ header="#3c3b37" header_text="#d3d2cd" header_text_hi="#ffffff" - button="#696965" + button="#696965ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeUserPreferences> @@ -700,10 +797,17 @@ header="#464541" header_text="#acacac" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b37ff" button_title="#000000" button_text="#000000" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> </ThemeConsole> @@ -732,10 +836,17 @@ header="#464541" header_text="#9c9c9c" header_text_hi="#ffffff" - button="#3c3b37" + button="#3c3b37ff" button_title="#9c9c9c" button_text="#ffffff" button_text_hi="#ffffff"> + <panelcolors> + <ThemePanelColors header="#00000000" + back="#72727280" + show_header="TRUE" + show_back="FALSE"> + </ThemePanelColors> + </panelcolors> </ThemeSpaceGeneric> </space> <space_list> diff --git a/release/scripts/startup/bl_operators/node.py b/release/scripts/startup/bl_operators/node.py index fb264cb3429..071eb2e75f9 100644 --- a/release/scripts/startup/bl_operators/node.py +++ b/release/scripts/startup/bl_operators/node.py @@ -20,7 +20,92 @@ import bpy from bpy.types import Operator -from bpy.props import EnumProperty +from bpy.props import EnumProperty, StringProperty + +# Base class for node 'Add' operators +class NodeAddOperator(): + @staticmethod + def store_mouse_cursor(context, event): + space = context.space_data + v2d = context.region.view2d + + # convert mouse position to the View2D for later node placement + space.cursor_location = v2d.region_to_view(event.mouse_region_x, + event.mouse_region_y) + + def create_node(self, context, node_type): + space = context.space_data + tree = space.edit_tree + + # select only the new node + for n in tree.nodes: + n.select = False + + node = tree.nodes.new(type=node_type) + + node.select = True + tree.nodes.active = node + node.location = space.cursor_location + return node + + @classmethod + def poll(cls, context): + space = context.space_data + # needs active node editor and a tree to add nodes to + return (space.type == 'NODE_EDITOR' and space.edit_tree) + + # Default invoke stores the mouse position to place the node correctly + def invoke(self, context, event): + self.store_mouse_cursor(context, event) + return self.execute(context) + + +# Simple basic operator for adding a node +class NODE_OT_add_node(NodeAddOperator, Operator): + '''Add a node to the active tree''' + bl_idname = "node.add_node" + bl_label = "Add Node" + + type = StringProperty( + name="Node Type", + description="Node type", + ) + # optional group tree parameter for group nodes + group_tree = StringProperty( + name="Group tree", + description="Group node tree name", + ) + def execute(self, context): + node = self.create_node(context, self.type) + + # set the node group tree of a group node + if self.properties.is_property_set('group_tree'): + node.node_tree = bpy.data.node_groups[self.group_tree] + + return {'FINISHED'} + + +# Adds a node and immediately starts the transform operator for inserting in a tree +class NODE_OT_add_node_move(NODE_OT_add_node): + '''Add a node to the active tree and start transform''' + bl_idname = "node.add_node_move" + bl_label = "Add Node and Move" + + type = StringProperty( + name="Node Type", + description="Node type", + ) + # optional group tree parameter for group nodes + group_tree = StringProperty( + name="Group tree", + description="Group node tree name", + ) + + def invoke(self, context, event): + self.store_mouse_cursor(context, event) + self.execute(context) + return bpy.ops.transform.translate('INVOKE_DEFAULT') + # XXX These node item lists should actually be generated by a callback at # operator execution time (see node_type_items below), diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 105b532ac38..c24e0920213 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1620,7 +1620,7 @@ class WM_OT_addon_disable(Operator): class WM_OT_theme_install(Operator): - "Install a theme" + "Load and apply a Blender XML theme file" bl_idname = "wm.theme_install" bl_label = "Install Theme..." diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 6125540d491..e33bed7ec6d 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -36,8 +36,8 @@ class MESH_MT_vertex_group_specials(Menu): layout.operator("object.vertex_group_mirror", icon='ARROW_LEFTRIGHT') layout.operator("object.vertex_group_remove", icon='X', text="Delete All").all = True layout.separator() - layout.operator("object.vertex_group_lock", icon='LOCKED', text="Lock All").action = 'SELECT' - layout.operator("object.vertex_group_lock", icon='UNLOCKED', text="UnLock All").action = 'DESELECT' + layout.operator("object.vertex_group_lock", icon='LOCKED', text="Lock All").action = 'LOCK' + layout.operator("object.vertex_group_lock", icon='UNLOCKED', text="UnLock All").action = 'UNLOCK' layout.operator("object.vertex_group_lock", icon='LOCKED', text="Lock Invert All").action = 'INVERT' diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 62461d800f6..e90d1616929 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -1032,5 +1032,47 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def TRIANGULATE(self, layout, ob, md): layout.prop(md, "use_beauty") + def UV_WARP(self, layout, ob, md): + split = layout.split() + col = split.column() + col.prop(md, "center"); + + col = split.column() + col.label(text="UV Axis:") + col.prop(md, "axis_u", text=""); + col.prop(md, "axis_v", text=""); + + split = layout.split() + col = split.column() + col.label(text="From:") + col.prop(md, "object_from", text="") + + col = split.column() + col.label(text="To:") + col.prop(md, "object_to", text="") + + split = layout.split() + col = split.column() + obj = md.object_from + if obj and obj.type == 'ARMATURE': + col.label(text="Bone:") + col.prop_search(md, "bone_from", obj.data, "bones", text="") + + col = split.column() + obj = md.object_to + if obj and obj.type == 'ARMATURE': + col.label(text="Bone:") + col.prop_search(md, "bone_to", obj.data, "bones", text="") + + split = layout.split() + + col = split.column() + col.label(text="Vertex Group:") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + + col = split.column() + col.label(text="UV Map:") + col.prop_search(md, "uv_layer", ob.data, "uv_textures", text="") + if __name__ == "__main__": # only for live edit. bpy.utils.register_module(__name__) diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index bf0c9eb762a..42f651de6df 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -402,14 +402,18 @@ class RENDER_PT_game_system(RenderButtonsPanel, Panel): layout = self.layout gs = context.scene.game_settings - - row = layout.row() - row.prop(gs, "use_frame_rate") - row.prop(gs, "restrict_animation_updates") - + col = layout.column() + row = col.row() + col = row.column() + col.prop(gs, "use_frame_rate") + col.prop(gs, "restrict_animation_updates") + col = row.column() + col.prop(gs, "use_display_lists") + col.active = gs.raster_storage != 'VERTEX_BUFFER_OBJECT' + row = layout.row() - row.prop(gs, "use_display_lists") - + row.prop(gs, "raster_storage") + row = layout.row() row.label("Exit Key") row.prop(gs, "exit_key", text="", event=True) diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 3f672d2a977..2c2ced5db0c 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -490,11 +490,13 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): col.prop(part, "integrator", text="") col.prop(part, "timestep") sub = col.row() - if part.adaptive_subframes: - sub.prop(part, "courant_target", text="Threshold") - else: - sub.prop(part, "subframes") - sub.prop(part, "adaptive_subframes", text="") + sub.prop(part, "subframes") + supports_courant = part.physics_type == 'FLUID' + subsub = sub.row() + subsub.enabled = supports_courant + subsub.prop(part, "adaptive_subframes", text="") + if supports_courant and part.adaptive_subframes: + col.prop(part, "courant_target", text="Threshold") row = layout.row() row.prop(part, "use_size_deflect") @@ -504,6 +506,10 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): fluid = part.fluid split = layout.split() + sub = split.row() + sub.prop(fluid, "solver", expand=True) + + split = layout.split() col = split.column() col.label(text="Fluid properties:") @@ -514,13 +520,14 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): col = split.column() col.label(text="Advanced:") - sub = col.row() - sub.prop(fluid, "repulsion", slider=fluid.factor_repulsion) - sub.prop(fluid, "factor_repulsion", text="") + if fluid.solver == 'DDR': + sub = col.row() + sub.prop(fluid, "repulsion", slider=fluid.factor_repulsion) + sub.prop(fluid, "factor_repulsion", text="") - sub = col.row() - sub.prop(fluid, "stiff_viscosity", slider=fluid.factor_stiff_viscosity) - sub.prop(fluid, "factor_stiff_viscosity", text="") + sub = col.row() + sub.prop(fluid, "stiff_viscosity", slider=fluid.factor_stiff_viscosity) + sub.prop(fluid, "factor_stiff_viscosity", text="") sub = col.row() sub.prop(fluid, "fluid_radius", slider=fluid.factor_radius) @@ -530,27 +537,37 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): sub.prop(fluid, "rest_density", slider=fluid.factor_density) sub.prop(fluid, "factor_density", text="") - split = layout.split() - - col = split.column() - col.label(text="Springs:") - col.prop(fluid, "spring_force", text="Force") - col.prop(fluid, "use_viscoelastic_springs") - sub = col.column(align=True) - sub.active = fluid.use_viscoelastic_springs - sub.prop(fluid, "yield_ratio", slider=True) - sub.prop(fluid, "plasticity", slider=True) - - col = split.column() - col.label(text="Advanced:") - sub = col.row() - sub.prop(fluid, "rest_length", slider=fluid.factor_rest_length) - sub.prop(fluid, "factor_rest_length", text="") - col.label(text="") - sub = col.column() - sub.active = fluid.use_viscoelastic_springs - sub.prop(fluid, "use_initial_rest_length") - sub.prop(fluid, "spring_frames", text="Frames") + if fluid.solver == 'CLASSICAL': + # With the classical solver, it is possible to calculate the + # spacing between particles when the fluid is at rest. This + # makes it easier to set stable initial conditions. + particle_volume = part.mass / fluid.rest_density + spacing = pow(particle_volume, 1/3) + sub = col.row() + sub.label(text="Spacing: %g" % spacing) + + elif fluid.solver == 'DDR': + split = layout.split() + + col = split.column() + col.label(text="Springs:") + col.prop(fluid, "spring_force", text="Force") + col.prop(fluid, "use_viscoelastic_springs") + sub = col.column(align=True) + sub.active = fluid.use_viscoelastic_springs + sub.prop(fluid, "yield_ratio", slider=True) + sub.prop(fluid, "plasticity", slider=True) + + col = split.column() + col.label(text="Advanced:") + sub = col.row() + sub.prop(fluid, "rest_length", slider=fluid.factor_rest_length) + sub.prop(fluid, "factor_rest_length", text="") + col.label(text="") + sub = col.column() + sub.active = fluid.use_viscoelastic_springs + sub.prop(fluid, "use_initial_rest_length") + sub.prop(fluid, "spring_frames", text="Frames") elif part.physics_type == 'KEYED': split = layout.split() diff --git a/release/scripts/startup/bl_ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py index 5a44294f0e0..91b4cc0ae49 100644 --- a/release/scripts/startup/bl_ui/properties_physics_cloth.py +++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py @@ -91,7 +91,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, Panel): sub.prop(cloth, "pin_stiffness", text="Stiffness") col.label(text="Pre roll:") - col.prop(cloth, "pre_roll", text="Frame") + col.prop(cloth, "pre_roll", text="Frames") # Disabled for now """ diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index df43677601f..8031bd26bee 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -492,7 +492,7 @@ class RENDER_PT_bake(RenderButtonsPanel, Panel): layout.prop(rd, "bake_type") multires_bake = False - if rd.bake_type in ['NORMALS', 'DISPLACEMENT']: + if rd.bake_type in ['NORMALS', 'DISPLACEMENT', 'AO']: layout.prop(rd, "use_bake_multires") multires_bake = rd.use_bake_multires @@ -521,11 +521,19 @@ class RENDER_PT_bake(RenderButtonsPanel, Panel): sub.prop(rd, "bake_distance") sub.prop(rd, "bake_bias") else: - if rd.bake_type == 'DISPLACEMENT': - layout.prop(rd, "use_bake_lores_mesh") + split = layout.split() - layout.prop(rd, "use_bake_clear") - layout.prop(rd, "bake_margin") + col = split.column() + col.prop(rd, "use_bake_clear") + col.prop(rd, "bake_margin") + + if rd.bake_type == 'DISPLACEMENT': + col = split.column() + col.prop(rd, "use_bake_lores_mesh") + if rd.bake_type == 'AO': + col = split.column() + col.prop(rd, "bake_bias") + col.prop(rd, "bake_rays_number") if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index fdfd43157c7..5b7a3a82aae 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -867,6 +867,10 @@ class SEQUENCER_PT_preview(SequencerButtonsPanel_Output, Panel): #col.active = render.use_sequencer_gl_preview col.prop(render, "sequencer_gl_preview", text="") + row = col.row() + row.active = render.sequencer_gl_preview == 'SOLID' + row.prop(render, "use_sequencer_gl_textured_solid") + class SEQUENCER_PT_view(SequencerButtonsPanel_Output, Panel): bl_label = "View Settings" diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 0bb25e98456..7c6c8dce954 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -84,7 +84,7 @@ class USERPREF_HT_header(Header): userpref = context.user_preferences layout.operator_context = 'EXEC_AREA' - layout.operator("wm.save_homefile", text="Save As Default") + layout.operator("wm.save_userpref") layout.operator_context = 'INVOKE_DEFAULT' @@ -445,6 +445,7 @@ class USERPREF_PT_system(Panel): col.label(text="Window Draw Method:") col.prop(system, "window_draw_method", text="") col.prop(system, "multi_sample", text="") + col.prop(system, "use_region_overlap") col.label(text="Text Draw Options:") col.prop(system, "use_text_antialiasing") col.label(text="Textures:") @@ -491,15 +492,15 @@ class USERPREF_PT_system(Panel): sub.active = system.use_weight_color_range sub.template_color_ramp(system, "weight_color_range", expand=True) - column.separator() - - column.prop(system, "use_international_fonts") - if system.use_international_fonts: - column.prop(system, "language") - row = column.row() - row.label(text="Translate:") - row.prop(system, "use_translate_interface", text="Interface") - row.prop(system, "use_translate_tooltips", text="Tooltips") + if 'INTERNATIONAL' in bpy.app.build_options: + column.separator() + column.prop(system, "use_international_fonts") + if system.use_international_fonts: + column.prop(system, "language") + row = column.row() + row.label(text="Translate:") + row.prop(system, "use_translate_interface", text="Interface") + row.prop(system, "use_translate_tooltips", text="Tooltips") class USERPREF_MT_interface_theme_presets(Menu): @@ -706,30 +707,6 @@ class USERPREF_PT_theme(Panel): col.separator() col.separator() - ui = theme.user_interface.panel - col.label("Panels:") - - row = col.row() - - subsplit = row.split(percentage=0.95) - - padding = subsplit.split(percentage=0.15) - colsub = padding.column() - colsub = padding.column() - rowsub = colsub.row() - rowsub.prop(ui, "show_header") - rowsub.label() - - subsplit = row.split(percentage=0.85) - - padding = subsplit.split(percentage=0.15) - colsub = padding.column() - colsub = padding.column() - colsub.row().prop(ui, "header") - - col.separator() - col.separator() - ui = theme.user_interface col.label("Axis Colors:") @@ -855,6 +832,7 @@ class USERPREF_PT_file(Panel): col.prop(paths, "recent_files") col.prop(paths, "use_save_preview_images") col.label(text="Auto Save:") + col.prop(paths, "use_keep_session") col.prop(paths, "use_auto_save_temporary_files") sub = col.column() sub.active = paths.use_auto_save_temporary_files diff --git a/release/scripts/templates/operator_modal_view3d_raycast.py b/release/scripts/templates/operator_modal_view3d_raycast.py index 3236c08cc8c..eac76922187 100644 --- a/release/scripts/templates/operator_modal_view3d_raycast.py +++ b/release/scripts/templates/operator_modal_view3d_raycast.py @@ -16,7 +16,6 @@ def main(context, event, ray_max=10000.0): ray_origin = view3d_utils.region_2d_to_origin_3d(region, rv3d, coord) ray_target = ray_origin + (view_vector * ray_max) - scene.cursor_location = ray_target def visible_objects_and_duplis(): """Loop over (object, matrix) pairs (mesh only)""" @@ -58,7 +57,9 @@ def main(context, event, ray_max=10000.0): if obj.type == 'MESH': hit, normal, face_index = obj_ray_cast(obj, matrix) if hit is not None: - length_squared = (hit - ray_origin).length_squared + hit_world = matrix * hit + scene.cursor_location = hit_world + length_squared = (hit_world - ray_origin).length_squared if length_squared < best_length_squared: best_length_squared = length_squared best_obj = obj @@ -67,6 +68,7 @@ def main(context, event, ray_max=10000.0): # we could do lots of stuff but for the example just select. if best_obj is not None: best_obj.select = True + context.scene.objects.active = best_obj class ViewOperatorRayCast(bpy.types.Operator): @@ -105,3 +107,4 @@ def unregister(): if __name__ == "__main__": register() + |