diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /release/scripts/presets/interface_theme/science_lab.xml | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'release/scripts/presets/interface_theme/science_lab.xml')
| -rw-r--r-- | release/scripts/presets/interface_theme/science_lab.xml | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/release/scripts/presets/interface_theme/science_lab.xml b/release/scripts/presets/interface_theme/science_lab.xml index 98dddfb0014..b767e4a837b 100644 --- a/release/scripts/presets/interface_theme/science_lab.xml +++ b/release/scripts/presets/interface_theme/science_lab.xml @@ -241,6 +241,9 @@ <ThemeView3D grid="#416064" wire="#439ad2" wire_edit="#7f7f7f" + gp_vertex="#000000" + gp_vertex_select="#ff8500" + gp_vertex_size="3" lamp="#dbac00b9" speaker="#229cd8" camera="#e28400" @@ -296,6 +299,7 @@ bundle_solid="#6e6e6e" camera_path="#9f5500" skin_root="#f1b66e" + clipping_border_3d="#313131ff" paint_curve_handle="#7fff7f7f" paint_curve_pivot="#ff7f7f7f"> <space> @@ -542,7 +546,10 @@ </ThemeDopeSheet> </dopesheet_editor> <image_editor> - <ThemeImageEditor vertex="#bcf7fa" + <ThemeImageEditor gp_vertex="#000000" + gp_vertex_select="#ff8500" + gp_vertex_size="3" + vertex="#bcf7fa" vertex_select="#ffc700" vertex_size="5" vertex_unreferenced="#000000" @@ -605,7 +612,10 @@ </ThemeImageEditor> </image_editor> <sequence_editor> - <ThemeSequenceEditor grid="#404040" + <ThemeSequenceEditor gp_vertex="#000000" + gp_vertex_select="#ff8500" + gp_vertex_size="3" + grid="#404040" window_sliders="#a0a0a0" movie_strip="#516987" movieclip_strip="#20208f" @@ -716,7 +726,9 @@ </text_editor> <timeline> <ThemeTimeline grid="#5b5b5b" - frame_current="#bac6af"> + frame_current="#bac6af" + time_keyframe="#ddd700" + time_grease_pencil="#b5e61d"> <space> <ThemeSpaceGeneric back="#333333" title="#000000" @@ -745,7 +757,10 @@ </ThemeTimeline> </timeline> <node_editor> - <ThemeNodeEditor node_selected="#6ebdff" + <ThemeNodeEditor gp_vertex="#000000" + gp_vertex_select="#ff8500" + gp_vertex_size="3" + node_selected="#6ebdff" node_active="#fefff3" wire="#9effc5" wire_inner="#737373" @@ -964,7 +979,10 @@ </ThemeConsole> </console> <clip_editor> - <ThemeClipEditor marker_outline="#000000" + <ThemeClipEditor gp_vertex="#000000" + gp_vertex_select="#000000" + gp_vertex_size="1" + marker_outline="#000000" marker="#7f7f00" active_marker="#ffffff" selected_marker="#ffff00" |