diff options
31 files changed, 4332 insertions, 86 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 415f95a516f..6a695d3af5d 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -115,6 +115,8 @@ else: bitness = '64' scons_options.append('BF_BITNESS=' + bitness) + scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True') + scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe') retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) sys.exit(retcode) diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 94640803aae..91444fe080a 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -79,6 +79,8 @@ if builder.find('scons') != -1: bitness = '64' scons_options.append('BF_BITNESS=' + bitness) + scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True') + scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe') retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) sys.exit(retcode) diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index b84890fbba3..8082c1e6986 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -99,7 +99,7 @@ else: # enable ffmpeg support WITH_BF_FFMPEG = True # -DWITH_FFMPEG -BF_FFMPEG = LIBDIR + '/ffmpeg' +BF_FFMPEG = LIBDIR + '/ffmpeg_0.10' BF_FFMPEG_INC = "${BF_FFMPEG}/include" BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2' diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index a71ab04b888..fe481d7ef34 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -158,7 +158,7 @@ def validate_arguments(args, bc): 'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC', 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC', - 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES' 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE', + 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES', 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE', 'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH', 'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH', 'WITH_BF_LIBMV', 'WITH_BF_CARVE' diff --git a/intern/audaspace/intern/AUD_SequencerReader.cpp b/intern/audaspace/intern/AUD_SequencerReader.cpp index 44df66ccc3a..7c8fe9eef4e 100644 --- a/intern/audaspace/intern/AUD_SequencerReader.cpp +++ b/intern/audaspace/intern/AUD_SequencerReader.cpp @@ -176,6 +176,8 @@ void AUD_SequencerReader::read(int& length, bool& eos, sample_t* buffer) } m_factory->m_volume.read(frame, &volume); + if(m_factory->m_muted) + volume = 0.0f; m_device.setVolume(volume); m_factory->m_orientation.read(frame, q.get()); diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt index d0870c8da9c..d8e9c0c94d7 100644 --- a/intern/boolop/CMakeLists.txt +++ b/intern/boolop/CMakeLists.txt @@ -23,6 +23,8 @@ # # ***** END GPL LICENSE BLOCK ***** +remove_strict_flags() + set(INC . extern diff --git a/intern/boolop/intern/BOP_CarveInterface.cpp b/intern/boolop/intern/BOP_CarveInterface.cpp index d94c7573a9d..6fc08e52ade 100644 --- a/intern/boolop/intern/BOP_CarveInterface.cpp +++ b/intern/boolop/intern/BOP_CarveInterface.cpp @@ -46,24 +46,31 @@ typedef unsigned int uint; #define MAX(x,y) ((x)>(y)?(x):(y)) #define MIN(x,y) ((x)<(y)?(x):(y)) -static int isFacePlanar(CSG_IFace &face, std::vector<carve::geom3d::Vector> &vertices) +static bool isQuadPlanar(carve::geom3d::Vector &v1, carve::geom3d::Vector &v2, + carve::geom3d::Vector &v3, carve::geom3d::Vector &v4) { - carve::geom3d::Vector v1, v2, v3, cross; + carve::geom3d::Vector vec1, vec2, vec3, cross; - if (face.vertex_number == 4) { - v1 = vertices[face.vertex_index[1]] - vertices[face.vertex_index[0]]; - v2 = vertices[face.vertex_index[3]] - vertices[face.vertex_index[0]]; - v3 = vertices[face.vertex_index[2]] - vertices[face.vertex_index[0]]; + vec1 = v2 - v1; + vec2 = v4 - v1; + vec3 = v3 - v1; + + cross = carve::geom::cross(vec1, vec2); - cross = carve::geom::cross(v1, v2); + float production = carve::geom::dot(cross, vec3); + float magnitude = 1e-6 * cross.length(); - float production = carve::geom::dot(cross, v3); - float magnitude = 1e-6 * cross.length(); + return fabs(production) < magnitude; +} - return fabs(production) < magnitude; +static bool isFacePlanar(CSG_IFace &face, std::vector<carve::geom3d::Vector> &vertices) +{ + if (face.vertex_number == 4) { + return isQuadPlanar(vertices[face.vertex_index[0]], vertices[face.vertex_index[1]], + vertices[face.vertex_index[2]], vertices[face.vertex_index[3]]); } - return 1; + return true; } static void Carve_copyMeshes(std::vector<MeshSet<3>::mesh_t*> &meshes, std::vector<MeshSet<3>::mesh_t*> &new_meshes) @@ -200,30 +207,35 @@ static void Carve_getIntersectedOperandMeshes(std::vector<MeshSet<3>::mesh_t*> & while(it != meshes.end()) { MeshSet<3>::mesh_t *mesh = *it; - bool isIntersect = false; + bool isAdded = false; RTreeNode<3, Face<3> *> *rtree = RTreeNode<3, Face<3> *>::construct_STR(mesh->faces.begin(), mesh->faces.end(), 4, 4); - std::vector<MeshSet<3>::mesh_t*>::iterator operand_it = operandMeshes.begin(); - std::vector<RTreeNode<3, Face<3> *> *>::iterator tree_it = meshRTree.begin(); - for(; operand_it!=operandMeshes.end(); operand_it++, tree_it++) { - RTreeNode<3, Face<3> *> *operandRTree = *tree_it; + if (rtree->bbox.intersects(otherAABB)) { + bool isIntersect = false; + + std::vector<MeshSet<3>::mesh_t*>::iterator operand_it = operandMeshes.begin(); + std::vector<RTreeNode<3, Face<3> *> *>::iterator tree_it = meshRTree.begin(); + for(; operand_it!=operandMeshes.end(); operand_it++, tree_it++) { + RTreeNode<3, Face<3> *> *operandRTree = *tree_it; - if(operandRTree->bbox.intersects(otherAABB)) { if(Carve_checkMeshSetInterseciton(rtree, operandRTree)) { isIntersect = true; break; } } - } - if(!isIntersect) { - operandMeshes.push_back(mesh); - meshRTree.push_back(rtree); + if(!isIntersect) { + operandMeshes.push_back(mesh); + meshRTree.push_back(rtree); - it = meshes.erase(it); + it = meshes.erase(it); + isAdded = true; + } } - else { + + if (!isAdded) { + delete rtree; it++; } } @@ -239,6 +251,9 @@ static MeshSet<3> *Carve_getIntersectedOperand(std::vector<MeshSet<3>::mesh_t*> std::vector<MeshSet<3>::mesh_t*> operandMeshes; Carve_getIntersectedOperandMeshes(meshes, otherAABB, operandMeshes); + if (operandMeshes.size() == 0) + return NULL; + return Carve_meshSetFromMeshes(operandMeshes); } @@ -259,9 +274,19 @@ static MeshSet<3> *Carve_unionIntersectingMeshes(MeshSet<3> *poly, MeshSet<3> *left = Carve_getIntersectedOperand(orig_meshes, otherAABB); + if (!left) { + /* no maniforlds which intersects another object at all */ + return poly; + } + while(orig_meshes.size()) { MeshSet<3> *right = Carve_getIntersectedOperand(orig_meshes, otherAABB); + if (!right) { + /* no more intersecting manifolds which intersects other object */ + break; + } + try { if(left->meshes.size()==0) { delete left; @@ -295,6 +320,15 @@ static MeshSet<3> *Carve_unionIntersectingMeshes(MeshSet<3> *poly, } } + /* append all meshes which doesn't have intersection with another operand as-is */ + if (orig_meshes.size()) { + MeshSet<3> *result = Carve_meshSetFromTwoMeshes(left->meshes, orig_meshes); + + delete left; + + return result; + } + return left; } @@ -396,8 +430,63 @@ static MeshSet<3> *Carve_addMesh(CSG_FaceIteratorDescriptor &face_it, return poly; } +static bool checkValidQuad(std::vector<MeshSet<3>::vertex_t> &vertex_storage, uint quad[4]) +{ + carve::geom3d::Vector &v1 = vertex_storage[quad[0]].v; + carve::geom3d::Vector &v2 = vertex_storage[quad[1]].v; + carve::geom3d::Vector &v3 = vertex_storage[quad[2]].v; + carve::geom3d::Vector &v4 = vertex_storage[quad[3]].v; + +#if 0 + /* disabled for now to prevent initially non-planar be triangulated + * in theory this might cause some artifacts if intersections happens by non-planar + * non-concave quad, but in practice it's acceptable */ + if (!isQuadPlanar(v1, v2, v3, v4)) { + /* non-planar faces better not be merged because of possible differences in triangulation + * of non-planar faces in opengl and renderer */ + return false; + } +#endif + + carve::geom3d::Vector edges[4]; + carve::geom3d::Vector normal; + bool normal_set = false; + + edges[0] = v2 - v1; + edges[1] = v3 - v2; + edges[2] = v4 - v3; + edges[3] = v1 - v4; + + for (int i = 0; i < 4; i++) { + int n = i + 1; + + if (n == 4) + n = 0; + + carve::geom3d::Vector current_normal = carve::geom::cross(edges[i], edges[n]); + + if (current_normal.length() > 1e-6) { + if (!normal_set) { + normal = current_normal; + normal_set = true; + } + else if (carve::geom::dot(normal, current_normal) < -1e-6) { + return false; + } + } + } + + if (!normal_set) { + /* normal wasn't set means face is degraded and better merge it in such way */ + return false; + } + + return true; +} + // check whether two faces share an edge, and if so merge them static uint quadMerge(std::map<MeshSet<3>::vertex_t*, uint> *vertexToIndex_map, + std::vector<MeshSet<3>::vertex_t> &vertex_storage, MeshSet<3>::face_t *f1, MeshSet<3>::face_t *f2, uint v, uint quad[4]) { @@ -432,7 +521,7 @@ static uint quadMerge(std::map<MeshSet<3>::vertex_t*, uint> *vertexToIndex_map, quad[2] = v1[p1]; quad[3] = v2[p2]; - return 1; + return checkValidQuad(vertex_storage, quad); } else if (v1[n1] == v2[p2]) { quad[0] = v1[current]; @@ -440,7 +529,7 @@ static uint quadMerge(std::map<MeshSet<3>::vertex_t*, uint> *vertexToIndex_map, quad[2] = v1[n1]; quad[3] = v1[p1]; - return 1; + return checkValidQuad(vertex_storage, quad); } return 0; @@ -539,7 +628,7 @@ static BSP_CSGMesh *Carve_exportMesh(MeshSet<3>* &poly, carve::interpolate::Face if (other_index == fl.size()) continue; // see if the faces share an edge - result = quadMerge(&vertexToIndex_map, f, f2, v, quadverts); + result = quadMerge(&vertexToIndex_map, poly->vertex_storage, f, f2, v, quadverts); // if faces can be merged, then remove the other face // from the current set if (result) { diff --git a/release/scripts/modules/rna_xml.py b/release/scripts/modules/rna_xml.py index c39d904bf08..eae7840b69b 100644 --- a/release/scripts/modules/rna_xml.py +++ b/release/scripts/modules/rna_xml.py @@ -150,13 +150,14 @@ def rna2xml(fw=print_ln, # declare + attributes if pretty_format: - tmp_str = "<%s " % value_type_name - tmp_ident = "\n" + ident + (" " * len(tmp_str)) - - fw("%s%s%s>\n" % (ident, tmp_str, tmp_ident.join(node_attrs))) - - del tmp_str - del tmp_ident + if node_attrs: + tmp_str = "<%s " % value_type_name + tmp_ident = "\n" + ident + (" " * len(tmp_str)) + fw("%s%s%s>\n" % (ident, tmp_str, tmp_ident.join(node_attrs))) + del tmp_str + del tmp_ident + else: + fw("%s<%s>\n" % (ident, value_type_name)) else: fw("%s<%s %s>\n" % (ident, value_type_name, " ".join(node_attrs))) diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml new file mode 100644 index 00000000000..76c30bb293b --- /dev/null +++ b/release/scripts/presets/interface_theme/back_to_black.xml @@ -0,0 +1,813 @@ +<bpy> + <Theme> + <view_3d> + <ThemeView3D object_active="#ff8c19" + editmesh_active="#ffffff80" + act_spline="#db2512" + handle_align="#803060" + handle_sel_align="#f090a0" + handle_auto="#909000" + handle_sel_auto="#f0ff40" + bone_pose="#50c8ff" + bone_solid="#c8c8c8" + bundle_solid="#c8c8c8" + camera_path="#5a5a5a" + frame_current="#60c040" + edge_crease="#cc0099" + extra_edge_len="#ffedf8" + edge_seam="#db2512" + edge_select="#ffa000" + edge_sharp="#ff2020" + edge_facesel="#6b6b6b" + face="#73828f12" + extra_face_angle="#00c900" + extra_face_area="#fff000" + face_dot="#ffa900" + facedot_size="4" + normal="#22dddd" + face_select="#ffa4003c" + handle_free="#7f7f7f" + handle_sel_free="#3b3b3b" + grid="#222222" + lamp="#c1d40028" + lastsel_point="#ffffff" + nurb_uline="#909000" + nurb_vline="#803060" + nurb_sel_uline="#f0ff40" + nurb_sel_vline="#f090a0" + object_grouped="#083008" + object_grouped_active="#55bb55" + object_selected="#f15800" + outline_width="1" + panel="#a5a5a57f" + speaker="#535353" + transform="#ffffff" + handle_vect="#409030" + handle_sel_vect="#40c030" + vertex="#72cfdd" + vertex_normal="#2361dd" + vertex_select="#ff8500" + vertex_size="3" + wire="#888888"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#7d7d7d" + text_hi="#ffffff" + title="#5d5d5d" + back="#0f0f0f"> + </ThemeSpaceGeneric> + </space> + </ThemeView3D> + </view_3d> + <clip_editor> + <ThemeClipEditor active_marker="#ffffff" + frame_current="#1b501b" + disabled_marker="#7f0000" + grid="#5e5e5e" + handle_vertex="#e2e2e2" + handle_vertex_select="#ffff00" + handle_vertex_size="4" + locked_marker="#7f7f7f" + marker="#7f7f00" + marker_outline="#0094af" + path_after="#0000ff" + path_before="#ff0000" + selected_marker="#ffff00"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#070707" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#ffffff" + text_hi="#ffffff" + title="#5d5d5d" + back="#0d0d0d"> + </ThemeSpaceGeneric> + </space> + </ThemeClipEditor> + </clip_editor> + <console> + <ThemeConsole cursor="#dc6060" + line_error="#dc6060" + line_info="#00aa00" + line_input="#cecece" + line_output="#6080ff"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#7d7d7d" + text_hi="#ffffff" + title="#5d5d5d" + back="#0f0f0f"> + </ThemeSpaceGeneric> + </space> + </ThemeConsole> + </console> + <dopesheet_editor> + <ThemeDopeSheet active_channels_group="#87b17d" + channel_group="#4f6549" + channels="#707070" + channels_selected="#60c040" + frame_current="#2a5c1c" + dopesheet_channel="#52606e" + dopesheet_subchannel="#7c8996" + grid="#212121" + long_key="#0c0a0a" + long_key_selected="#ff8c00" + value_sliders="#000000" + view_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#ffffff" + text_hi="#ffffff" + title="#5d5d5d" + back="#080808"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#020202" + list_text="#ebebeb" + list_text_hi="#ffffff" + list_title="#2c2c2c"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeDopeSheet> + </dopesheet_editor> + <file_browser> + <ThemeFileBrowser active_file="#b1b1b1" + active_file_text="#ffffff" + scroll_handle="#7f7070" + scrollbar="#a0a0a0" + selected_file="#354d66" + tiles="#343434"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#7d7d7d" + text_hi="#ffffff" + title="#5d5d5d" + back="#000000"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#181818" + list_text="#5d5d5d" + list_text_hi="#ffffff" + list_title="#9e9e9e"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeFileBrowser> + </file_browser> + <graph_editor> + <ThemeGraphEditor active_channels_group="#87b17d" + handle_align="#803060" + handle_sel_align="#f090a0" + handle_auto="#909000" + handle_sel_auto="#f0ff40" + handle_auto_clamped="#994030" + handle_sel_auto_clamped="#f0af90" + channel_group="#4f6549" + channels_region="#6d6d6d" + frame_current="#336622" + dopesheet_channel="#52606e" + dopesheet_subchannel="#7c8996" + handle_free="#808080" + handle_sel_free="#808080" + grid="#262626" + handle_vertex="#808080" + handle_vertex_select="#ff8500" + handle_vertex_size="3" + lastsel_point="#808080" + panel="#ffffff" + handle_vect="#409030" + handle_sel_vect="#40c030" + vertex="#ffffff" + vertex_select="#ff8500" + vertex_size="3" + window_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#ffffff" + text_hi="#ffffff" + title="#5d5d5d" + back="#0d0d0d"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#1a1a1a" + list_text="#bbbbbb" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeGraphEditor> + </graph_editor> + <image_editor> + <ThemeImageEditor editmesh_active="#ffffff80" + face="#ffffff0a" + face_dot="#ff8500" + facedot_size="3" + face_select="#ff85003c" + scope_back="#050505ff" + preview_stitch_active="#e1d2c323" + preview_stitch_edge="#ff8500b2" + preview_stitch_face="#1242b026" + preview_stitch_stitchable="#00ff00ff" + preview_stitch_unstitchable="#ff0000ff" + preview_stitch_vert="#ff85007f" + vertex="#0f13bb" + vertex_select="#ff8500" + vertex_size="3"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#7d7d7d" + text_hi="#ffffff" + title="#5d5d5d" + back="#000000"> + </ThemeSpaceGeneric> + </space> + </ThemeImageEditor> + </image_editor> + <info> + <ThemeInfo> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#adadad" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#9b9b9b" + text_hi="#ffffff" + title="#5d5d5d" + back="#000000"> + </ThemeSpaceGeneric> + </space> + </ThemeInfo> + </info> + <logic_editor> + <ThemeLogicEditor panel="#a5a5a5"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#7d7d7d" + text_hi="#ffffff" + title="#5d5d5d" + back="#070707"> + </ThemeSpaceGeneric> + </space> + </ThemeLogicEditor> + </logic_editor> + <nla_editor> + <ThemeNLAEditor bars="#707070" + bars_selected="#60c040" + frame_current="#2f6421" + grid="#5e5e5e" + strips="#aa8d8d" + strips_selected="#ff8c00" + view_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c3c3c3" + text="#ffffff" + text_hi="#ffffff" + title="#585858" + back="#0d0d0d"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#0c0c0c" + list_text="#d8d8d8" + list_text_hi="#ffffff" + list_title="#383838"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeNLAEditor> + </nla_editor> + <node_editor> + <ThemeNodeEditor converter_node="#113941" + group_node="#091a07" + in_out_node="#273053" + node_backdrop="#202030bc" + noodle_curving="5" + operator_node="#0e3157" + selected_text="#7f7070" + wire_select="#0019ff" + wire="#6eafff"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#c7c7c7" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#7d7d7d" + text_hi="#ffffff" + title="#5d5d5d" + back="#000000"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#a5a5a5" + list_text="#ffffff" + list_text_hi="#b8ffff" + list_title="#ffffff"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeNodeEditor> + </node_editor> + <outliner> + <ThemeOutliner match="#245824" + selected_highlight="#212844"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#cccccc" + text_hi="#ffffff" + title="#9b9b9b" + back="#070707"> + </ThemeSpaceGeneric> + </space> + </ThemeOutliner> + </outliner> + <properties> + <ThemeProperties panel="#828282"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#7d7d7d" + text_hi="#ffffff" + title="#5d5d5d" + back="#000000"> + </ThemeSpaceGeneric> + </space> + </ThemeProperties> + </properties> + <sequence_editor> + <ThemeSequenceEditor audio_strip="#2e8f8f" + frame_current="#2f5f23" + draw_action="#50c8ff" + effect_strip="#a9547c" + grid="#282828" + image_strip="#6d5881" + keyframe="#ff8500" + meta_strip="#6d9183" + movie_strip="#516987" + plugin_strip="#7e7e50" + scene_strip="#4e983e" + transition_strip="#a25f6f" + window_sliders="#a0a0a0"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#f3f3f3" + header_text_hi="#ffffff" + button="#020202" + button_text="#dddddd" + button_text_hi="#ffffff" + button_title="#bdbdbd" + text="#ffffff" + text_hi="#ffffff" + title="#5d5d5d" + back="#202020"> + </ThemeSpaceGeneric> + </space> + </ThemeSequenceEditor> + </sequence_editor> + <text_editor> + <ThemeTextEditor cursor="#ff0000" + line_numbers_background="#191919" + scroll_bar="#acacac" + selected_text="#ffffff" + syntax_builtin="#cf3d99" + syntax_comment="#249d60" + syntax_numbers="#3c68ff" + syntax_special="#969629" + syntax_string="#cc3535"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#b9b9b9" + header_text_hi="#ffffff" + button="#000000" + button_text="#cccccc" + button_text_hi="#ffffff" + button_title="#d8d8d8" + text="#ebebeb" + text_hi="#ffffff" + title="#9e9e9e" + back="#050505"> + </ThemeSpaceGeneric> + </space> + </ThemeTextEditor> + </text_editor> + <timeline> + <ThemeTimeline frame_current="#2e5820" + grid="#272727"> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#c7c7c7" + text_hi="#ffffff" + title="#5d5d5d" + back="#000000"> + </ThemeSpaceGeneric> + </space> + </ThemeTimeline> + </timeline> + <user_interface> + <ThemeUserInterface icon_alpha="1" + icon_file=""> + <wcol_box> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_box> + <wcol_list_item> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_list_item> + <wcol_menu_back> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_menu_back> + <wcol_menu_item> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_menu_item> + <wcol_menu> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#2a2a2aff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_menu> + <wcol_num> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#2a2a2aff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_num> + <wcol_option> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#000000ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#c7c7c7" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_option> + <panel> + <ThemePanelColors header="#000000ff" + show_header="FALSE"> + </ThemePanelColors> + </panel> + <wcol_progress> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_progress> + <wcol_pulldown> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_pulldown> + <wcol_radio> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_radio> + <wcol_regular> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_regular> + <wcol_scroll> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_scroll> + <wcol_numslider> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#111111ff" + item="#33406bff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_numslider> + <wcol_state> + <ThemeWidgetStateColors inner_anim="#56ff00" + inner_anim_sel="#56ff00" + blend="0.1" + inner_driven="#b400ff" + inner_driven_sel="#9900e6" + inner_key="#fff400" + inner_key_sel="#fff400"> + </ThemeWidgetStateColors> + </wcol_state> + <wcol_text> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#e4e4e4" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_text> + <wcol_toggle> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_toggle> + <wcol_tool> + <ThemeWidgetColors inner="#111111ff" + inner_sel="#33406bff" + item="#191919ff" + outline="#2a2a2a" + shadedown="0" + shadetop="-100" + show_shaded="TRUE" + text="#929292" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_tool> + </ThemeUserInterface> + </user_interface> + <user_preferences> + <ThemeUserPreferences> + <space> + <ThemeSpaceGeneric header="#000000" + header_text="#979797" + header_text_hi="#ffffff" + button="#000000" + button_text="#c3c3c3" + button_text_hi="#ffffff" + button_title="#c5c5c5" + text="#7d7d7d" + text_hi="#ffffff" + title="#5d5d5d" + back="#000000"> + </ThemeSpaceGeneric> + </space> + </ThemeUserPreferences> + </user_preferences> + <bone_color_sets> + <ThemeBoneColorSet active="#f70a0a" + show_colored_constraints="FALSE" + normal="#9a0000" + select="#bd1111"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#fa9900" + show_colored_constraints="FALSE" + normal="#f74018" + select="#f66913"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#83ef1d" + show_colored_constraints="FALSE" + normal="#1e9109" + select="#59b70b"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#5ec1ef" + show_colored_constraints="FALSE" + normal="#0a3694" + select="#3667df"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#f05d91" + show_colored_constraints="FALSE" + normal="#a9294e" + select="#c1416a"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#8764d5" + show_colored_constraints="FALSE" + normal="#430c78" + select="#543aa3"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#6fb6ab" + show_colored_constraints="FALSE" + normal="#24785a" + select="#3c9579"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#9bc2cd" + show_colored_constraints="FALSE" + normal="#4b707c" + select="#6a8691"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#f3ff00" + show_colored_constraints="FALSE" + normal="#f4c90c" + select="#eec236"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#ffffff" + show_colored_constraints="FALSE" + normal="#1e2024" + select="#484c56"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#d330d6" + show_colored_constraints="FALSE" + normal="#6f2f6a" + select="#9845be"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#bbef5b" + show_colored_constraints="FALSE" + normal="#6c8e22" + select="#7fb022"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#dedede" + show_colored_constraints="FALSE" + normal="#8d8d8d" + select="#b0b0b0"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#bd6a11" + show_colored_constraints="FALSE" + normal="#834326" + select="#8b5811"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#34622b" + show_colored_constraints="FALSE" + normal="#08310e" + select="#1c430b"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + </bone_color_sets> + </Theme> +</bpy> diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml new file mode 100644 index 00000000000..046a05982cf --- /dev/null +++ b/release/scripts/presets/interface_theme/blender_24x.xml @@ -0,0 +1,813 @@ +<bpy> + <Theme> + <view_3d> + <ThemeView3D object_active="#ffbbff" + editmesh_active="#ffffff80" + act_spline="#db2512" + handle_align="#803060" + handle_sel_align="#f090a0" + handle_auto="#909000" + handle_sel_auto="#f0ff40" + bone_pose="#50c8ff" + bone_solid="#c8c8c8" + bundle_solid="#c8c8c8" + camera_path="#000000" + frame_current="#60c040" + edge_crease="#cc0099" + extra_edge_len="#200000" + edge_seam="#e69632" + edge_select="#cece38" + edge_sharp="#ff2020" + edge_facesel="#4b4b4b" + face="#0032961e" + extra_face_angle="#000080" + extra_face_area="#002000" + face_dot="#ff8a30" + facedot_size="4" + normal="#22dddd" + face_select="#c864c83c" + handle_free="#000000" + handle_sel_free="#000000" + grid="#5c5c5c" + lamp="#00000028" + lastsel_point="#ffffff" + nurb_uline="#909000" + nurb_vline="#803060" + nurb_sel_uline="#f0ff40" + nurb_sel_vline="#f090a0" + object_grouped="#104010" + object_grouped_active="#55bb55" + object_selected="#ff88ff" + outline_width="1" + panel="#a5a5a5ff" + speaker="#000000" + transform="#ffffff" + handle_vect="#409030" + handle_sel_vect="#40c030" + vertex="#ff70ff" + vertex_normal="#2361dd" + vertex_select="#ffff70" + vertex_size="2" + wire="#000000"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#5a5a5a" + button_text_hi="#ffffff" + button_title="#5a5a5a" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#757575"> + </ThemeSpaceGeneric> + </space> + </ThemeView3D> + </view_3d> + <clip_editor> + <ThemeClipEditor active_marker="#ffffff" + frame_current="#60c040" + disabled_marker="#7f0000" + grid="#5e5e5e" + handle_vertex="#000000" + handle_vertex_select="#ffff00" + handle_vertex_size="4" + locked_marker="#7f7f7f" + marker="#7f7f00" + marker_outline="#000000" + path_after="#0000ff" + path_before="#ff0000" + selected_marker="#ffff00"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#757575"> + </ThemeSpaceGeneric> + </space> + </ThemeClipEditor> + </clip_editor> + <console> + <ThemeConsole cursor="#dc6060" + line_error="#dc6060" + line_info="#00aa00" + line_input="#ffffff" + line_output="#000000"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#b4b4b4"> + </ThemeSpaceGeneric> + </space> + </ThemeConsole> + </console> + <dopesheet_editor> + <ThemeDopeSheet active_channels_group="#87b17d" + channel_group="#4f6549" + channels="#707070" + channels_selected="#60c040" + frame_current="#60c040" + dopesheet_channel="#52606e" + dopesheet_subchannel="#7c8996" + grid="#858585" + long_key="#0c0a0a" + long_key_selected="#ff8c00" + value_sliders="#000000" + view_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#a0a0a0"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#b4b4b4" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeDopeSheet> + </dopesheet_editor> + <file_browser> + <ThemeFileBrowser active_file="#828282" + active_file_text="#fafafa" + scroll_handle="#7f7070" + scrollbar="#a0a0a0" + selected_file="#7f7f7f" + tiles="#b4b4b4"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#0f0f0f" + title="#000000" + back="#b4b4b4"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#b4b4b4" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeFileBrowser> + </file_browser> + <graph_editor> + <ThemeGraphEditor active_channels_group="#87b17d" + handle_align="#803060" + handle_sel_align="#f090a0" + handle_auto="#909000" + handle_sel_auto="#f0ff40" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" + channel_group="#4f6549" + channels_region="#707070" + frame_current="#60c040" + dopesheet_channel="#52606e" + dopesheet_subchannel="#7c8996" + handle_free="#000000" + handle_sel_free="#000000" + grid="#818181" + handle_vertex="#000000" + handle_vertex_select="#ff8500" + handle_vertex_size="3" + lastsel_point="#ffffff" + panel="#ffffff" + handle_vect="#409030" + handle_sel_vect="#40c030" + vertex="#000000" + vertex_select="#ff8500" + vertex_size="3" + window_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#727272" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#979797"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#b4b4b4" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeGraphEditor> + </graph_editor> + <image_editor> + <ThemeImageEditor editmesh_active="#ffffff80" + face="#ffffff0a" + face_dot="#ff8500" + facedot_size="3" + face_select="#ff85003c" + scope_back="#b4b4b4ff" + preview_stitch_active="#e1d2c323" + preview_stitch_edge="#ff8500b2" + preview_stitch_face="#1242b026" + preview_stitch_stitchable="#00ff00ff" + preview_stitch_unstitchable="#ff0000ff" + preview_stitch_vert="#ff85007f" + vertex="#000000" + vertex_select="#ff8500" + vertex_size="3"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#757575"> + </ThemeSpaceGeneric> + </space> + </ThemeImageEditor> + </image_editor> + <info> + <ThemeInfo> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#b4b4b4"> + </ThemeSpaceGeneric> + </space> + </ThemeInfo> + </info> + <logic_editor> + <ThemeLogicEditor panel="#a5a5a5"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#b4b4b4"> + </ThemeSpaceGeneric> + </space> + </ThemeLogicEditor> + </logic_editor> + <nla_editor> + <ThemeNLAEditor bars="#707070" + bars_selected="#60c040" + frame_current="#60c040" + grid="#5e5e5e" + strips="#0c0a0a" + strips_selected="#ff8c00" + view_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#757575"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#b4b4b4" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeNLAEditor> + </nla_editor> + <node_editor> + <ThemeNodeEditor converter_node="#686a75" + group_node="#69756e" + in_out_node="#646464" + node_backdrop="#9b9b9ba0" + noodle_curving="5" + operator_node="#6c696f" + selected_text="#7f7070" + wire_select="#ffffff" + wire="#000000"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#757575"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#a5a5a5" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeNodeEditor> + </node_editor> + <outliner> + <ThemeOutliner match="#337f33" + selected_highlight="#82878c"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#b4b4b4"> + </ThemeSpaceGeneric> + </space> + </ThemeOutliner> + </outliner> + <properties> + <ThemeProperties panel="#828282"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#b4b4b4"> + </ThemeSpaceGeneric> + </space> + </ThemeProperties> + </properties> + <sequence_editor> + <ThemeSequenceEditor audio_strip="#2e8f8f" + frame_current="#60c040" + draw_action="#50c8ff" + effect_strip="#a9547c" + grid="#404040" + image_strip="#6d5881" + keyframe="#ff8500" + meta_strip="#6d9183" + movie_strip="#516987" + plugin_strip="#7e7e50" + scene_strip="#4e983e" + transition_strip="#a25f6f" + window_sliders="#a0a0a0"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#949494"> + </ThemeSpaceGeneric> + </space> + </ThemeSequenceEditor> + </sequence_editor> + <text_editor> + <ThemeTextEditor cursor="#ff0000" + line_numbers_background="#818181" + scroll_bar="#8f8f8f" + selected_text="#c67777" + syntax_builtin="#800050" + syntax_comment="#006432" + syntax_numbers="#0000c8" + syntax_special="#5f5f00" + syntax_string="#640000"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#999999"> + </ThemeSpaceGeneric> + </space> + </ThemeTextEditor> + </text_editor> + <timeline> + <ThemeTimeline frame_current="#60c040" + grid="#5b5b5b"> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#999999"> + </ThemeSpaceGeneric> + </space> + </ThemeTimeline> + </timeline> + <user_interface> + <ThemeUserInterface icon_alpha="1" + icon_file=""> + <wcol_box> + <ThemeWidgetColors inner="#d4d4d4ff" + inner_sel="#646464ff" + item="#191919ff" + outline="#262626" + shadedown="0" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_box> + <wcol_list_item> + <ThemeWidgetColors inner="#00000000" + inner_sel="#7f7f7fff" + item="#000000ff" + outline="#000000" + shadedown="0" + shadetop="0" + show_shaded="FALSE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_list_item> + <wcol_menu_back> + <ThemeWidgetColors inner="#d2d2d2ff" + inner_sel="#999999ff" + item="#646464ff" + outline="#000000" + shadedown="25" + shadetop="-25" + show_shaded="FALSE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_menu_back> + <wcol_menu_item> + <ThemeWidgetColors inner="#00000000" + inner_sel="#7f7f7fff" + item="#ffffffff" + outline="#000000" + shadedown="0" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_menu_item> + <wcol_menu> + <ThemeWidgetColors inner="#d0d0d0ff" + inner_sel="#464646ff" + item="#717171ff" + outline="#262626" + shadedown="-10" + shadetop="5" + show_shaded="TRUE" + text="#000000" + text_sel="#cccccc"> + </ThemeWidgetColors> + </wcol_menu> + <wcol_num> + <ThemeWidgetColors inner="#a1a1a1a4" + inner_sel="#999999ff" + item="#585858ff" + outline="#262626" + shadedown="0" + shadetop="-5" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_num> + <wcol_option> + <ThemeWidgetColors inner="#aababbff" + inner_sel="#667677ff" + item="#ffffffff" + outline="#262626" + shadedown="-10" + shadetop="10" + show_shaded="TRUE" + text="#000000" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_option> + <panel> + <ThemePanelColors header="#00000019" + show_header="FALSE"> + </ThemePanelColors> + </panel> + <wcol_progress> + <ThemeWidgetColors inner="#bebebeff" + inner_sel="#646464b4" + item="#444444ff" + outline="#000000" + shadedown="0" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_progress> + <wcol_pulldown> + <ThemeWidgetColors inner="#3f3f3fff" + inner_sel="#7f7f7fff" + item="#ffffffff" + outline="#000000" + shadedown="-10" + shadetop="15" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_pulldown> + <wcol_radio> + <ThemeWidgetColors inner="#d0d0d0ff" + inner_sel="#667677ff" + item="#ffffffff" + outline="#262626" + shadedown="-10" + shadetop="10" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_radio> + <wcol_regular> + <ThemeWidgetColors inner="#999999ff" + inner_sel="#646464ff" + item="#191919ff" + outline="#262626" + shadedown="-10" + shadetop="10" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_regular> + <wcol_scroll> + <ThemeWidgetColors inner="#b4b4b42e" + inner_sel="#646464b4" + item="#b4b4b4ff" + outline="#262626" + shadedown="0" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_scroll> + <wcol_numslider> + <ThemeWidgetColors inner="#808080ff" + inner_sel="#999999ff" + item="#d2d2d2ff" + outline="#262626" + shadedown="0" + shadetop="-20" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_numslider> + <wcol_state> + <ThemeWidgetStateColors inner_anim="#73be4c" + inner_anim_sel="#5aa633" + blend="0.5" + inner_driven="#b400ff" + inner_driven_sel="#9900e6" + inner_key="#f0eb64" + inner_key_sel="#d7d34b"> + </ThemeWidgetStateColors> + </wcol_state> + <wcol_text> + <ThemeWidgetColors inner="#aea8b2ff" + inner_sel="#999999ff" + item="#5a5a5aff" + outline="#262626" + shadedown="10" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_text> + <wcol_toggle> + <ThemeWidgetColors inner="#d0d0d0ff" + inner_sel="#7d7d7dff" + item="#191919ff" + outline="#262626" + shadedown="-15" + shadetop="15" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_toggle> + <wcol_tool> + <ThemeWidgetColors inner="#c6bab0ff" + inner_sel="#646464ff" + item="#191919ff" + outline="#262626" + shadedown="-10" + shadetop="10" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_tool> + </ThemeUserInterface> + </user_interface> + <user_preferences> + <ThemeUserPreferences> + <space> + <ThemeSpaceGeneric header="#b4b4b4" + header_text="#000000" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#999999"> + </ThemeSpaceGeneric> + </space> + </ThemeUserPreferences> + </user_preferences> + <bone_color_sets> + <ThemeBoneColorSet active="#f70a0a" + show_colored_constraints="FALSE" + normal="#9a0000" + select="#bd1111"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#fa9900" + show_colored_constraints="FALSE" + normal="#f74018" + select="#f66913"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#83ef1d" + show_colored_constraints="FALSE" + normal="#1e9109" + select="#59b70b"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#5ec1ef" + show_colored_constraints="FALSE" + normal="#0a3694" + select="#3667df"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#f05d91" + show_colored_constraints="FALSE" + normal="#a9294e" + select="#c1416a"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#8764d5" + show_colored_constraints="FALSE" + normal="#430c78" + select="#543aa3"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#6fb6ab" + show_colored_constraints="FALSE" + normal="#24785a" + select="#3c9579"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#9bc2cd" + show_colored_constraints="FALSE" + normal="#4b707c" + select="#6a8691"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#f3ff00" + show_colored_constraints="FALSE" + normal="#f4c90c" + select="#eec236"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#ffffff" + show_colored_constraints="FALSE" + normal="#1e2024" + select="#484c56"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#d330d6" + show_colored_constraints="FALSE" + normal="#6f2f6a" + select="#9845be"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#bbef5b" + show_colored_constraints="FALSE" + normal="#6c8e22" + select="#7fb022"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#dedede" + show_colored_constraints="FALSE" + normal="#8d8d8d" + select="#b0b0b0"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#bd6a11" + show_colored_constraints="FALSE" + normal="#834326" + select="#8b5811"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#34622b" + show_colored_constraints="FALSE" + normal="#08310e" + select="#1c430b"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + </bone_color_sets> + </Theme> +</bpy> diff --git a/release/scripts/presets/interface_theme/elsyiun.xml b/release/scripts/presets/interface_theme/elsyiun.xml new file mode 100644 index 00000000000..cce51d6de38 --- /dev/null +++ b/release/scripts/presets/interface_theme/elsyiun.xml @@ -0,0 +1,813 @@ +<bpy> + <Theme> + <view_3d> + <ThemeView3D object_active="#ff7c00" + editmesh_active="#ffffff80" + act_spline="#db2512" + handle_align="#803060" + handle_sel_align="#f090a0" + handle_auto="#909000" + handle_sel_auto="#f0ff40" + bone_pose="#50c8ff" + bone_solid="#c8c8c8" + bundle_solid="#c8c8c8" + camera_path="#000000" + frame_current="#60c040" + edge_crease="#cc0099" + extra_edge_len="#200000" + edge_seam="#db2512" + edge_select="#cb7027" + edge_sharp="#00ffff" + edge_facesel="#4b4b4b" + face="#00000036" + extra_face_angle="#000080" + extra_face_area="#002000" + face_dot="#be6925" + facedot_size="2" + normal="#22dddd" + face_select="#a47c5b73" + handle_free="#000000" + handle_sel_free="#000000" + grid="#585858" + lamp="#00000028" + lastsel_point="#ffffff" + nurb_uline="#909000" + nurb_vline="#803060" + nurb_sel_uline="#f0ff40" + nurb_sel_vline="#f090a0" + object_grouped="#083008" + object_grouped_active="#55bb55" + object_selected="#ffffff" + outline_width="1" + panel="#a5a5a57f" + speaker="#000000" + transform="#ffffff" + handle_vect="#409030" + handle_sel_vect="#40c030" + vertex="#93b2c2" + vertex_normal="#2361dd" + vertex_select="#be6925" + vertex_size="3" + wire="#000000"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#b9b9b9" + header_text_hi="#ffffff" + button="#3b3b3b" + button_text="#979797" + button_text_hi="#ffffff" + button_title="#979797" + text="#b8b8b8" + text_hi="#e9e9e9" + title="#000000" + back="#4b4b4b"> + </ThemeSpaceGeneric> + </space> + </ThemeView3D> + </view_3d> + <clip_editor> + <ThemeClipEditor active_marker="#ffffff" + frame_current="#60c040" + disabled_marker="#7f0000" + grid="#5e5e5e" + handle_vertex="#000000" + handle_vertex_select="#ffff00" + handle_vertex_size="4" + locked_marker="#7f7f7f" + marker="#7f7f00" + marker_outline="#000000" + path_after="#0000ff" + path_before="#ff0000" + selected_marker="#ffff00"> + <space> + <ThemeSpaceGeneric header="#313131" + header_text="#000000" + header_text_hi="#ffffff" + button="#3b3b3b" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#393939"> + </ThemeSpaceGeneric> + </space> + </ThemeClipEditor> + </clip_editor> + <console> + <ThemeConsole cursor="#dc6060" + line_error="#dc6060" + line_info="#00aa00" + line_input="#ffffff" + line_output="#b8b8b8"> + <space> + <ThemeSpaceGeneric header="#303030" + header_text="#000000" + header_text_hi="#ffffff" + button="#3b3b3b" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#202020"> + </ThemeSpaceGeneric> + </space> + </ThemeConsole> + </console> + <dopesheet_editor> + <ThemeDopeSheet active_channels_group="#87b17d" + channel_group="#4f6549" + channels="#707070" + channels_selected="#60c040" + frame_current="#60c040" + dopesheet_channel="#52606e" + dopesheet_subchannel="#7c8996" + grid="#585858" + long_key="#0c0a0a" + long_key_selected="#ff8c00" + value_sliders="#000000" + view_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#aaaaaa" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#ffffff" + text_hi="#ffffff" + title="#000000" + back="#4b4b4b"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#3b3b3b" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeDopeSheet> + </dopesheet_editor> + <file_browser> + <ThemeFileBrowser active_file="#828282" + active_file_text="#fafafa" + scroll_handle="#7f7070" + scrollbar="#a0a0a0" + selected_file="#755129" + tiles="#3b3b3b"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#8b8b8b" + header_text_hi="#ffffff" + button="#303030" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#cacaca" + text_hi="#0f0f0f" + title="#8b8b8b" + back="#4b4b4b"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#3b3b3b" + list_text="#8b8b8b" + list_text_hi="#ffffff" + list_title="#8b8b8b"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeFileBrowser> + </file_browser> + <graph_editor> + <ThemeGraphEditor active_channels_group="#87b17d" + handle_align="#803060" + handle_sel_align="#f090a0" + handle_auto="#909000" + handle_sel_auto="#f0ff40" + handle_auto_clamped="#994030" + handle_sel_auto_clamped="#f0af90" + channel_group="#4f6549" + channels_region="#707070" + frame_current="#60c040" + dopesheet_channel="#52606e" + dopesheet_subchannel="#545d66" + handle_free="#000000" + handle_sel_free="#000000" + grid="#585858" + handle_vertex="#000000" + handle_vertex_select="#ff8500" + handle_vertex_size="4" + lastsel_point="#ffffff" + panel="#ffffff" + handle_vect="#409030" + handle_sel_vect="#40c030" + vertex="#000000" + vertex_select="#ff8500" + vertex_size="3" + window_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#3b3b3b" + button_text="#8b8b8b" + button_text_hi="#ffffff" + button_title="#8b8b8b" + text="#ffffff" + text_hi="#ffffff" + title="#8b8b8b" + back="#4b4b4b"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#3b3b3b" + list_text="#8b8b8b" + list_text_hi="#ffffff" + list_title="#8b8b8b"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeGraphEditor> + </graph_editor> + <image_editor> + <ThemeImageEditor editmesh_active="#ffffff80" + face="#a47c5b0a" + face_dot="#ffffff" + facedot_size="3" + face_select="#a47c5b3c" + scope_back="#303030ff" + preview_stitch_active="#e1d2c323" + preview_stitch_edge="#ff8500b2" + preview_stitch_face="#1242b026" + preview_stitch_stitchable="#00ff00ff" + preview_stitch_unstitchable="#ff0000ff" + preview_stitch_vert="#ff85007f" + vertex="#32adec" + vertex_select="#be6925" + vertex_size="3"> + <space> + <ThemeSpaceGeneric header="#303030" + header_text="#000000" + header_text_hi="#ffffff" + button="#303030" + button_text="#8b8b8b" + button_text_hi="#ffffff" + button_title="#8b8b8b" + text="#8b8b8b" + text_hi="#ffffff" + title="#8b8b8b" + back="#4b4b4b"> + </ThemeSpaceGeneric> + </space> + </ThemeImageEditor> + </image_editor> + <info> + <ThemeInfo> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#8b8b8b" + header_text_hi="#000000" + button="#3b3b3b" + button_text="#000000" + button_text_hi="#000000" + button_title="#000000" + text="#000000" + text_hi="#000000" + title="#000000" + back="#727272"> + </ThemeSpaceGeneric> + </space> + </ThemeInfo> + </info> + <logic_editor> + <ThemeLogicEditor panel="#3b3b3b"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#3b3b3b" + button_text="#8b8b8b" + button_text_hi="#ffffff" + button_title="#8b8b8b" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#3b3b3b"> + </ThemeSpaceGeneric> + </space> + </ThemeLogicEditor> + </logic_editor> + <nla_editor> + <ThemeNLAEditor bars="#707070" + bars_selected="#60c040" + frame_current="#60c040" + grid="#585858" + strips="#0c0a0a" + strips_selected="#ff8c00" + view_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#3b3b3b" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#ffffff" + text_hi="#ffffff" + title="#8b8b8b" + back="#4b4b4b"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#3b3b3b" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeNLAEditor> + </nla_editor> + <node_editor> + <ThemeNodeEditor converter_node="#575675" + group_node="#1e7524" + in_out_node="#e08706" + node_backdrop="#9b9b9ba0" + noodle_curving="5" + operator_node="#2c6f6f" + selected_text="#7f7070" + wire_select="#ffffff" + wire="#000000"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#3b3b3b" + button_text="#8b8b8b" + button_text_hi="#ffffff" + button_title="#8b8b8b" + text="#dbdbdb" + text_hi="#ffffff" + title="#8b8b8b" + back="#3b3b3b"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#a5a5a5" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeNodeEditor> + </node_editor> + <outliner> + <ThemeOutliner match="#337f33" + selected_highlight="#82878c"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#727272" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#cacaca" + text_hi="#ffffff" + title="#000000" + back="#4b4b4b"> + </ThemeSpaceGeneric> + </space> + </ThemeOutliner> + </outliner> + <properties> + <ThemeProperties panel="#828282"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#727272" + button_text="#b8b8b8" + button_text_hi="#ffffff" + button_title="#b8b8b8" + text="#b8b8b8" + text_hi="#ffffff" + title="#979797" + back="#3b3b3b"> + </ThemeSpaceGeneric> + </space> + </ThemeProperties> + </properties> + <sequence_editor> + <ThemeSequenceEditor audio_strip="#2e8f8f" + frame_current="#60c040" + draw_action="#50c8ff" + effect_strip="#a9547c" + grid="#818181" + image_strip="#6d5881" + keyframe="#ff8500" + meta_strip="#6d9183" + movie_strip="#516987" + plugin_strip="#7e7e50" + scene_strip="#4e983e" + transition_strip="#a25f6f" + window_sliders="#a0a0a0"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#3b3b3b" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#ffffff" + text_hi="#ffffff" + title="#8b8b8b" + back="#636363"> + </ThemeSpaceGeneric> + </space> + </ThemeSequenceEditor> + </sequence_editor> + <text_editor> + <ThemeTextEditor cursor="#8b8bff" + line_numbers_background="#2e2e2e" + scroll_bar="#8f8f8f" + selected_text="#4e4e8f" + syntax_builtin="#808bed" + syntax_comment="#cd8b00" + syntax_numbers="#f0ad6d" + syntax_special="#c080d0" + syntax_string="#ffcd8b"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#3b3b3b" + button_text="#8b8b8b" + button_text_hi="#ffffff" + button_title="#8b8b8b" + text="#cfbfad" + text_hi="#ffffff" + title="#8b8b8b" + back="#1e1e27"> + </ThemeSpaceGeneric> + </space> + </ThemeTextEditor> + </text_editor> + <timeline> + <ThemeTimeline frame_current="#60c040" + grid="#5b5b5b"> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#727272" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#b8b8b8" + text_hi="#ffffff" + title="#000000" + back="#4b4b4b"> + </ThemeSpaceGeneric> + </space> + </ThemeTimeline> + </timeline> + <user_interface> + <ThemeUserInterface icon_alpha="1" + icon_file=""> + <wcol_box> + <ThemeWidgetColors inner="#4b4b4bff" + inner_sel="#646464ff" + item="#191919ff" + outline="#2a2a2a" + shadedown="-7" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_box> + <wcol_list_item> + <ThemeWidgetColors inner="#00000000" + inner_sel="#a9753777" + item="#000000ff" + outline="#000000" + shadedown="-10" + shadetop="0" + show_shaded="TRUE" + text="#e0e0e0" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_list_item> + <wcol_menu_back> + <ThemeWidgetColors inner="#3b3b3bff" + inner_sel="#2d2d2de6" + item="#646464ff" + outline="#000000" + shadedown="-20" + shadetop="25" + show_shaded="FALSE" + text="#b8b8b8" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_menu_back> + <wcol_menu_item> + <ThemeWidgetColors inner="#00000000" + inner_sel="#b67e3eff" + item="#ffffffff" + outline="#000000" + shadedown="20" + shadetop="0" + show_shaded="TRUE" + text="#b8b8b8" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_menu_item> + <wcol_menu> + <ThemeWidgetColors inner="#444444ff" + inner_sel="#464646ff" + item="#7a7a7aff" + outline="#2c2c2c" + shadedown="0" + shadetop="5" + show_shaded="TRUE" + text="#b8b8b8" + text_sel="#cccccc"> + </ThemeWidgetColors> + </wcol_menu> + <wcol_num> + <ThemeWidgetColors inner="#414141ff" + inner_sel="#999999ff" + item="#7a7a7aff" + outline="#303030" + shadedown="0" + shadetop="5" + show_shaded="TRUE" + text="#b8b8b8" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_num> + <wcol_option> + <ThemeWidgetColors inner="#4e4e4eff" + inner_sel="#a9753aff" + item="#ffffffff" + outline="#303030" + shadedown="0" + shadetop="5" + show_shaded="TRUE" + text="#b8b8b8" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_option> + <panel> + <ThemePanelColors header="#00000019" + show_header="FALSE"> + </ThemePanelColors> + </panel> + <wcol_progress> + <ThemeWidgetColors inner="#bebebeff" + inner_sel="#646464b4" + item="#444444ff" + outline="#000000" + shadedown="0" + shadetop="0" + show_shaded="FALSE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_progress> + <wcol_pulldown> + <ThemeWidgetColors inner="#3f3f3fff" + inner_sel="#f78805ff" + item="#ffffffff" + outline="#000000" + shadedown="0" + shadetop="25" + show_shaded="TRUE" + text="#b8b8b8" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_pulldown> + <wcol_radio> + <ThemeWidgetColors inner="#414141ff" + inner_sel="#b67e3eff" + item="#ffffffff" + outline="#303030" + shadedown="0" + shadetop="5" + show_shaded="TRUE" + text="#b8b8b8" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_radio> + <wcol_regular> + <ThemeWidgetColors inner="#4e4e4eff" + inner_sel="#b67e3eff" + item="#191919ff" + outline="#191919" + shadedown="0" + shadetop="0" + show_shaded="FALSE" + text="#b8b8b8" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_regular> + <wcol_scroll> + <ThemeWidgetColors inner="#6c707200" + inner_sel="#646464b4" + item="#414141ff" + outline="#2d2d2d" + shadedown="0" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_scroll> + <wcol_numslider> + <ThemeWidgetColors inner="#606068ff" + inner_sel="#91919dff" + item="#4b4b4bff" + outline="#303030" + shadedown="0" + shadetop="-10" + show_shaded="TRUE" + text="#a2a2a2" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_numslider> + <wcol_state> + <ThemeWidgetStateColors inner_anim="#339900" + inner_anim_sel="#2b8000" + blend="0.5" + inner_driven="#b400ff" + inner_driven_sel="#9900e6" + inner_key="#999300" + inner_key_sel="#666200"> + </ThemeWidgetStateColors> + </wcol_state> + <wcol_text> + <ThemeWidgetColors inner="#7a8287ff" + inner_sel="#999999ff" + item="#5a5a5aff" + outline="#303030" + shadedown="0" + shadetop="5" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_text> + <wcol_toggle> + <ThemeWidgetColors inner="#555555ff" + inner_sel="#796348ff" + item="#191919ff" + outline="#303030" + shadedown="0" + shadetop="5" + show_shaded="TRUE" + text="#b8b8b8" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_toggle> + <wcol_tool> + <ThemeWidgetColors inner="#414141ff" + inner_sel="#b67e3eff" + item="#191919ff" + outline="#303030" + shadedown="0" + shadetop="5" + show_shaded="TRUE" + text="#b8b8b8" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_tool> + </ThemeUserInterface> + </user_interface> + <user_preferences> + <ThemeUserPreferences> + <space> + <ThemeSpaceGeneric header="#3b3b3b" + header_text="#000000" + header_text_hi="#ffffff" + button="#727272" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#b8b8b8" + text_hi="#ffffff" + title="#000000" + back="#3b3b3b"> + </ThemeSpaceGeneric> + </space> + </ThemeUserPreferences> + </user_preferences> + <bone_color_sets> + <ThemeBoneColorSet active="#f70a0a" + show_colored_constraints="FALSE" + normal="#9a0000" + select="#bd1111"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#fa9900" + show_colored_constraints="FALSE" + normal="#f74018" + select="#f66913"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#83ef1d" + show_colored_constraints="FALSE" + normal="#1e9109" + select="#59b70b"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#5ec1ef" + show_colored_constraints="FALSE" + normal="#0a3694" + select="#3667df"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#f05d91" + show_colored_constraints="FALSE" + normal="#a9294e" + select="#c1416a"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#8764d5" + show_colored_constraints="FALSE" + normal="#430c78" + select="#543aa3"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#6fb6ab" + show_colored_constraints="FALSE" + normal="#24785a" + select="#3c9579"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#9bc2cd" + show_colored_constraints="FALSE" + normal="#4b707c" + select="#6a8691"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#f3ff00" + show_colored_constraints="FALSE" + normal="#f4c90c" + select="#eec236"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#ffffff" + show_colored_constraints="FALSE" + normal="#1e2024" + select="#484c56"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#d330d6" + show_colored_constraints="FALSE" + normal="#6f2f6a" + select="#9845be"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#bbef5b" + show_colored_constraints="FALSE" + normal="#6c8e22" + select="#7fb022"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#dedede" + show_colored_constraints="FALSE" + normal="#8d8d8d" + select="#b0b0b0"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#bd6a11" + show_colored_constraints="FALSE" + normal="#834326" + select="#8b5811"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#34622b" + show_colored_constraints="FALSE" + normal="#08310e" + select="#1c430b"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + </bone_color_sets> + </Theme> +</bpy> diff --git a/release/scripts/presets/interface_theme/hexagon.xml b/release/scripts/presets/interface_theme/hexagon.xml new file mode 100644 index 00000000000..07c05656c26 --- /dev/null +++ b/release/scripts/presets/interface_theme/hexagon.xml @@ -0,0 +1,813 @@ +<bpy> + <Theme> + <view_3d> + <ThemeView3D object_active="#6ed8ff" + editmesh_active="#00e8ff80" + act_spline="#db2512" + handle_align="#803060" + handle_sel_align="#f090a0" + handle_auto="#909000" + handle_sel_auto="#f0ff40" + bone_pose="#50c8ff" + bone_solid="#c8c8c8" + bundle_solid="#c8c8c8" + camera_path="#000000" + frame_current="#60c040" + edge_crease="#cc0099" + extra_edge_len="#200000" + edge_seam="#e69632" + edge_select="#1151ce" + edge_sharp="#ff2020" + edge_facesel="#4b4b4b" + face="#affff418" + extra_face_angle="#00008a" + extra_face_area="#002000" + face_dot="#4fc9ff" + facedot_size="3" + normal="#00ffff" + face_select="#1151ce66" + handle_free="#000000" + handle_sel_free="#000000" + grid="#5e5e83" + lamp="#00000028" + lastsel_point="#ffffff" + nurb_uline="#909000" + nurb_vline="#803060" + nurb_sel_uline="#f0ff40" + nurb_sel_vline="#f090a0" + object_grouped="#104010" + object_grouped_active="#55bb55" + object_selected="#52c6ff" + outline_width="1" + panel="#a5a5a5ff" + speaker="#000000" + transform="#ffffff" + handle_vect="#409030" + handle_sel_vect="#40c030" + vertex="#334cca" + vertex_normal="#2361dd" + vertex_select="#0097da" + vertex_size="3" + wire="#000000"> + <space> + <ThemeSpaceGeneric header="#646875" + header_text="#000000" + header_text_hi="#ffffff" + button="#6c717f" + button_text="#d7d7d7" + button_text_hi="#ffffff" + button_title="#eaeaea" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7f818d"> + </ThemeSpaceGeneric> + </space> + </ThemeView3D> + </view_3d> + <clip_editor> + <ThemeClipEditor active_marker="#ffffff" + frame_current="#60c040" + disabled_marker="#7f0000" + grid="#5e5e5e" + handle_vertex="#000000" + handle_vertex_select="#ffff00" + handle_vertex_size="4" + locked_marker="#7f7f7f" + marker="#7f7f00" + marker_outline="#000000" + path_after="#0000ff" + path_before="#ff0000" + selected_marker="#ffff00"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#646875" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7c7e88"> + </ThemeSpaceGeneric> + </space> + </ThemeClipEditor> + </clip_editor> + <console> + <ThemeConsole cursor="#dc6060" + line_error="#dc0606" + line_info="#00aa00" + line_input="#ffffff" + line_output="#000000"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#6c717f" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7c7e88"> + </ThemeSpaceGeneric> + </space> + </ThemeConsole> + </console> + <dopesheet_editor> + <ThemeDopeSheet active_channels_group="#87b17d" + channel_group="#4f6549" + channels="#707070" + channels_selected="#60c040" + frame_current="#60c040" + dopesheet_channel="#52606e" + dopesheet_subchannel="#7c8996" + grid="#58587c" + long_key="#0c0a0a" + long_key_selected="#ff8c00" + value_sliders="#000000" + view_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#6c717f" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7c7e88"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#6c717f" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeDopeSheet> + </dopesheet_editor> + <file_browser> + <ThemeFileBrowser active_file="#859cb9" + active_file_text="#fafafa" + scroll_handle="#7f7070" + scrollbar="#a0a0a0" + selected_file="#69a5be" + tiles="#5c606c"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#dddddd" + header_text_hi="#ffffff" + button="#6c717f" + button_text="#d7d7d7" + button_text_hi="#ffffff" + button_title="#d7d7d7" + text="#000000" + text_hi="#0f0f0f" + title="#000000" + back="#646875"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#6c717f" + list_text="#d7d7d7" + list_text_hi="#ffffff" + list_title="#d7d7d7"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeFileBrowser> + </file_browser> + <graph_editor> + <ThemeGraphEditor active_channels_group="#87b17d" + handle_align="#803060" + handle_sel_align="#f090a0" + handle_auto="#909000" + handle_sel_auto="#f0ff40" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" + channel_group="#4f6549" + channels_region="#707070" + frame_current="#60c040" + dopesheet_channel="#52606e" + dopesheet_subchannel="#7c8996" + handle_free="#000000" + handle_sel_free="#000000" + grid="#58587c" + handle_vertex="#000000" + handle_vertex_select="#ff8500" + handle_vertex_size="3" + lastsel_point="#ffffff" + panel="#ffffff" + handle_vect="#409030" + handle_sel_vect="#40c030" + vertex="#000000" + vertex_select="#ff8500" + vertex_size="3" + window_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#646875" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7c7e88"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#6c717f" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeGraphEditor> + </graph_editor> + <image_editor> + <ThemeImageEditor editmesh_active="#ffffff80" + face="#ffffff0a" + face_dot="#50c8ff" + facedot_size="3" + face_select="#50c8ff3c" + scope_back="#646875ff" + preview_stitch_active="#e1d2c323" + preview_stitch_edge="#ff8500b2" + preview_stitch_face="#1242b026" + preview_stitch_stitchable="#00ff00ff" + preview_stitch_unstitchable="#ff0000ff" + preview_stitch_vert="#ff85007f" + vertex="#334cca" + vertex_select="#50c8ff" + vertex_size="3"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#646875" + button_text="#eeeeee" + button_text_hi="#ffffff" + button_title="#eeeeee" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7c7e88"> + </ThemeSpaceGeneric> + </space> + </ThemeImageEditor> + </image_editor> + <info> + <ThemeInfo> + <space> + <ThemeSpaceGeneric header="#646875" + header_text="#dddddd" + header_text_hi="#ffffff" + button="#b4b4b4" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#b4b4b4"> + </ThemeSpaceGeneric> + </space> + </ThemeInfo> + </info> + <logic_editor> + <ThemeLogicEditor panel="#a5a5a5"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#6c717f" + button_text="#d7d7d7" + button_text_hi="#ffffff" + button_title="#d7d7d7" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7c7e88"> + </ThemeSpaceGeneric> + </space> + </ThemeLogicEditor> + </logic_editor> + <nla_editor> + <ThemeNLAEditor bars="#707070" + bars_selected="#60c040" + frame_current="#60c040" + grid="#5e5e5e" + strips="#0c0a0a" + strips_selected="#ff8c00" + view_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#646875" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7c7e88"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#646875" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeNLAEditor> + </nla_editor> + <node_editor> + <ThemeNodeEditor converter_node="#686a84" + group_node="#69756e" + in_out_node="#64647b" + node_backdrop="#9b9baca0" + noodle_curving="5" + operator_node="#6c697e" + selected_text="#7f7070" + wire_select="#ffffff" + wire="#000000"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#646875" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7c7e88"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#a7a7a7" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeNodeEditor> + </node_editor> + <outliner> + <ThemeOutliner match="#245824" + selected_highlight="#212844"> + <space> + <ThemeSpaceGeneric header="#6c717f" + header_text="#000000" + header_text_hi="#ffffff" + button="#727272" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#e2e2e2" + text_hi="#ffffff" + title="#000000" + back="#72747c"> + </ThemeSpaceGeneric> + </space> + </ThemeOutliner> + </outliner> + <properties> + <ThemeProperties panel="#828282"> + <space> + <ThemeSpaceGeneric header="#646875" + header_text="#000000" + header_text_hi="#ffffff" + button="#727272" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#e7e7e7" + text_hi="#ffffff" + title="#ffffff" + back="#646875"> + </ThemeSpaceGeneric> + </space> + </ThemeProperties> + </properties> + <sequence_editor> + <ThemeSequenceEditor audio_strip="#2e8f8f" + frame_current="#60c040" + draw_action="#50c8ff" + effect_strip="#a9547c" + grid="#404040" + image_strip="#6d5881" + keyframe="#ff8500" + meta_strip="#6d9183" + movie_strip="#516987" + plugin_strip="#7e7e50" + scene_strip="#4e983e" + transition_strip="#a25f6f" + window_sliders="#a0a0a0"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#646875" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#90929c"> + </ThemeSpaceGeneric> + </space> + </ThemeSequenceEditor> + </sequence_editor> + <text_editor> + <ThemeTextEditor cursor="#ff0000" + line_numbers_background="#5a5e6a" + scroll_bar="#8f8f8f" + selected_text="#c67777" + syntax_builtin="#800050" + syntax_comment="#006432" + syntax_numbers="#0000c8" + syntax_special="#5f5f00" + syntax_string="#640000"> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#646875" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7c7e88"> + </ThemeSpaceGeneric> + </space> + </ThemeTextEditor> + </text_editor> + <timeline> + <ThemeTimeline frame_current="#60c040" + grid="#58587c"> + <space> + <ThemeSpaceGeneric header="#565863" + header_text="#000000" + header_text_hi="#ffffff" + button="#5a5e6a" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#646875"> + </ThemeSpaceGeneric> + </space> + </ThemeTimeline> + </timeline> + <user_interface> + <ThemeUserInterface icon_alpha="1" + icon_file=""> + <wcol_box> + <ThemeWidgetColors inner="#80828eff" + inner_sel="#646464ff" + item="#191919ff" + outline="#191919" + shadedown="0" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_box> + <wcol_list_item> + <ThemeWidgetColors inner="#00000000" + inner_sel="#50c8ff62" + item="#000000ff" + outline="#000000" + shadedown="0" + shadetop="0" + show_shaded="FALSE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_list_item> + <wcol_menu_back> + <ThemeWidgetColors inner="#393c44eb" + inner_sel="#2d2d2dff" + item="#646464ff" + outline="#000000" + shadedown="-40" + shadetop="40" + show_shaded="FALSE" + text="#cecece" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_menu_back> + <wcol_menu_item> + <ThemeWidgetColors inner="#00000000" + inner_sel="#69a5beff" + item="#ffffffff" + outline="#000000" + shadedown="0" + shadetop="0" + show_shaded="FALSE" + text="#d9d9d9" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_menu_item> + <wcol_menu> + <ThemeWidgetColors inner="#555d6dff" + inner_sel="#464646ff" + item="#9d9d9dff" + outline="#3d3d3d" + shadedown="0" + shadetop="15" + show_shaded="TRUE" + text="#ffffff" + text_sel="#cccccc"> + </ThemeWidgetColors> + </wcol_menu> + <wcol_num> + <ThemeWidgetColors inner="#8d909fff" + inner_sel="#999999ff" + item="#5d5d5dff" + outline="#464646" + shadedown="0" + shadetop="-10" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_num> + <wcol_option> + <ThemeWidgetColors inner="#bbbbbbff" + inner_sel="#777777ff" + item="#ffffffff" + outline="#464646" + shadedown="0" + shadetop="10" + show_shaded="TRUE" + text="#cecece" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_option> + <panel> + <ThemePanelColors header="#00000019" + show_header="TRUE"> + </ThemePanelColors> + </panel> + <wcol_progress> + <ThemeWidgetColors inner="#bebebeff" + inner_sel="#646464b4" + item="#444444ff" + outline="#000000" + shadedown="0" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_progress> + <wcol_pulldown> + <ThemeWidgetColors inner="#3f3f3fff" + inner_sel="#50c8ffff" + item="#ffffffff" + outline="#000000" + shadedown="-20" + shadetop="25" + show_shaded="FALSE" + text="#d8d8d8" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_pulldown> + <wcol_radio> + <ThemeWidgetColors inner="#8b8d9aff" + inner_sel="#859cb9ff" + item="#ffffffff" + outline="#000000" + shadedown="0" + shadetop="10" + show_shaded="TRUE" + text="#000000" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_radio> + <wcol_regular> + <ThemeWidgetColors inner="#8d909fff" + inner_sel="#859cb9ff" + item="#191919ff" + outline="#191919" + shadedown="0" + shadetop="0" + show_shaded="FALSE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_regular> + <wcol_scroll> + <ThemeWidgetColors inner="#5050502e" + inner_sel="#646464b4" + item="#737a8eff" + outline="#4f5057" + shadedown="0" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_scroll> + <wcol_numslider> + <ThemeWidgetColors inner="#b4b4b4ff" + inner_sel="#999999ff" + item="#b0b0b0ff" + outline="#3f3f3f" + shadedown="0" + shadetop="-20" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_numslider> + <wcol_state> + <ThemeWidgetStateColors inner_anim="#73be4c" + inner_anim_sel="#5aa633" + blend="0.5" + inner_driven="#b400ff" + inner_driven_sel="#9900e6" + inner_key="#f0eb64" + inner_key_sel="#d7d34b"> + </ThemeWidgetStateColors> + </wcol_state> + <wcol_text> + <ThemeWidgetColors inner="#9b9eadff" + inner_sel="#999999ff" + item="#5a5a5aff" + outline="#464646" + shadedown="25" + shadetop="0" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_text> + <wcol_toggle> + <ThemeWidgetColors inner="#afafafff" + inner_sel="#859cb9ff" + item="#191919ff" + outline="#464646" + shadedown="0" + shadetop="10" + show_shaded="TRUE" + text="#000000" + text_sel="#000000"> + </ThemeWidgetColors> + </wcol_toggle> + <wcol_tool> + <ThemeWidgetColors inner="#8d909fff" + inner_sel="#859cb9ff" + item="#191919ff" + outline="#000000" + shadedown="0" + shadetop="10" + show_shaded="TRUE" + text="#000000" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_tool> + </ThemeUserInterface> + </user_interface> + <user_preferences> + <ThemeUserPreferences> + <space> + <ThemeSpaceGeneric header="#5c606c" + header_text="#000000" + header_text_hi="#ffffff" + button="#6c717f" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#7c7e88"> + </ThemeSpaceGeneric> + </space> + </ThemeUserPreferences> + </user_preferences> + <bone_color_sets> + <ThemeBoneColorSet active="#f70a0a" + show_colored_constraints="FALSE" + normal="#9a0000" + select="#bd1111"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#fa9900" + show_colored_constraints="FALSE" + normal="#f74018" + select="#f66913"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#83ef1d" + show_colored_constraints="FALSE" + normal="#1e9109" + select="#59b70b"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#5ec1ef" + show_colored_constraints="FALSE" + normal="#0a3694" + select="#3667df"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#f05d91" + show_colored_constraints="FALSE" + normal="#a9294e" + select="#c1416a"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#8764d5" + show_colored_constraints="FALSE" + normal="#430c78" + select="#543aa3"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#6fb6ab" + show_colored_constraints="FALSE" + normal="#24785a" + select="#3c9579"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#9bc2cd" + show_colored_constraints="FALSE" + normal="#4b707c" + select="#6a8691"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#f3ff00" + show_colored_constraints="FALSE" + normal="#f4c90c" + select="#eec236"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#ffffff" + show_colored_constraints="FALSE" + normal="#1e2024" + select="#484c56"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#d330d6" + show_colored_constraints="FALSE" + normal="#6f2f6a" + select="#9845be"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#bbef5b" + show_colored_constraints="FALSE" + normal="#6c8e22" + select="#7fb022"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#dedede" + show_colored_constraints="FALSE" + normal="#8d8d8d" + select="#b0b0b0"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#bd6a11" + show_colored_constraints="FALSE" + normal="#834326" + select="#8b5811"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#34622b" + show_colored_constraints="FALSE" + normal="#08310e" + select="#1c430b"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + </bone_color_sets> + </Theme> +</bpy> diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml new file mode 100644 index 00000000000..40e311c552f --- /dev/null +++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml @@ -0,0 +1,813 @@ +<bpy> + <Theme> + <view_3d> + <ThemeView3D object_active="#f58032" + editmesh_active="#ffffff80" + act_spline="#ee4000" + handle_align="#862074" + handle_sel_align="#f090a0" + handle_auto="#909000" + handle_sel_auto="#f0ff40" + bone_pose="#50c8ff" + bone_solid="#c8c8c8" + bundle_solid="#c8c8c8" + camera_path="#000000" + frame_current="#60c040" + edge_crease="#ce33b8" + extra_edge_len="#200000" + edge_seam="#db4100" + edge_select="#f68d46" + edge_sharp="#ff4c00" + edge_facesel="#4b4b4b" + face="#75757512" + extra_face_angle="#002000" + extra_face_area="#0059ee" + face_dot="#ff8500" + facedot_size="3" + normal="#19b6ee" + face_select="#ff85003c" + handle_free="#000000" + handle_sel_free="#000000" + grid="#3c3b37" + lamp="#00000028" + lastsel_point="#ffffff" + nurb_uline="#909000" + nurb_vline="#862074" + nurb_sel_uline="#f0ff40" + nurb_sel_vline="#d15d85" + object_grouped="#083008" + object_grouped_active="#55bb55" + object_selected="#f15800" + outline_width="1" + panel="#a5a5a57f" + speaker="#000000" + transform="#ffffff" + handle_vect="#409030" + handle_sel_vect="#82c036" + vertex="#c96cb8" + vertex_normal="#19b6ee" + vertex_select="#f15800" + vertex_size="2" + wire="#862074"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#9c9c9c" + button_text_hi="#ffffff" + button_title="#9c9c9c" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + </ThemeView3D> + </view_3d> + <clip_editor> + <ThemeClipEditor active_marker="#ffffff" + frame_current="#c07100" + disabled_marker="#7f0000" + grid="#302e2c" + handle_vertex="#000000" + handle_vertex_select="#ffff00" + handle_vertex_size="4" + locked_marker="#7f7f7f" + marker="#76243b" + marker_outline="#000000" + path_after="#19b6ee" + path_before="#ff5100" + selected_marker="#d5ff00"> + <space> + <ThemeSpaceGeneric header="#3c3b37" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + </ThemeClipEditor> + </clip_editor> + <console> + <ThemeConsole cursor="#dc5a00" + line_error="#dc0000" + line_info="#85aa00" + line_input="#828282" + line_output="#f58032"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + </ThemeConsole> + </console> + <dopesheet_editor> + <ThemeDopeSheet active_channels_group="#a2b15c" + channel_group="#4f6549" + channels="#74736e" + channels_selected="#6592f5" + frame_current="#f58032" + dopesheet_channel="#64486e" + dopesheet_subchannel="#877096" + grid="#525252" + long_key="#0c0a0a" + long_key_selected="#f47421" + value_sliders="#000000" + view_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#3c3b37" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#dddddd"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeDopeSheet> + </dopesheet_editor> + <file_browser> + <ThemeFileBrowser active_file="#eeedeb" + active_file_text="#ffffff" + scroll_handle="#7f7070" + scrollbar="#a0a0a0" + selected_file="#6b395a" + tiles="#3c3b37"> + <space> + <ThemeSpaceGeneric header="#3c3b37" + header_text="#000000" + header_text_hi="#ffffff" + button="#727272" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#b2b2b1" + text_hi="#0f0f0f" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#3c3b37" + list_text="#95948f" + list_text_hi="#ffffff" + list_title="#95948f"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeFileBrowser> + </file_browser> + <graph_editor> + <ThemeGraphEditor active_channels_group="#87b17d" + handle_align="#803060" + handle_sel_align="#f090a0" + handle_auto="#909000" + handle_sel_auto="#f0ff40" + handle_auto_clamped="#994030" + handle_sel_auto_clamped="#f0af90" + channel_group="#4f6549" + channels_region="#707070" + frame_current="#f58032" + dopesheet_channel="#695c6e" + dopesheet_subchannel="#7c8996" + handle_free="#000000" + handle_sel_free="#000000" + grid="#3c3b37" + handle_vertex="#000000" + handle_vertex_select="#f47421" + handle_vertex_size="3" + lastsel_point="#000000" + panel="#ffffff" + handle_vect="#409030" + handle_sel_vect="#40c030" + vertex="#000000" + vertex_select="#ff8500" + vertex_size="3" + window_sliders="#95948f"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#c3c2bc" + button_text_hi="#ffffff" + button_title="#9e9d98" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#3c3b37" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeGraphEditor> + </graph_editor> + <image_editor> + <ThemeImageEditor editmesh_active="#ffffff80" + face="#ffffff0a" + face_dot="#f47421" + facedot_size="3" + face_select="#ff85003c" + scope_back="#3c3b37ff" + preview_stitch_active="#e1d2c323" + preview_stitch_edge="#ff8500b2" + preview_stitch_face="#1242b026" + preview_stitch_stitchable="#00ff00ff" + preview_stitch_unstitchable="#ff0000ff" + preview_stitch_vert="#ff85007f" + vertex="#000000" + vertex_select="#f47421" + vertex_size="3"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#b9b9b9" + button_text_hi="#ffffff" + button_title="#b1b1b1" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + </ThemeImageEditor> + </image_editor> + <info> + <ThemeInfo> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#ffffff" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#eeedeb" + button_text_hi="#ffffff" + button_title="#eeedeb" + text="#eeedeb" + text_hi="#ffffff" + title="#eeedeb" + back="#3c3b37"> + </ThemeSpaceGeneric> + </space> + </ThemeInfo> + </info> + <logic_editor> + <ThemeLogicEditor panel="#acacac"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#131311" + button_text="#acacac" + button_text_hi="#ffffff" + button_title="#7d7d7d" + text="#acacac" + text_hi="#ffffff" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + </ThemeLogicEditor> + </logic_editor> + <nla_editor> + <ThemeNLAEditor bars="#3c3b37" + bars_selected="#60c040" + frame_current="#f58032" + grid="#5c5c52" + strips="#0c0a0a" + strips_selected="#6b395a" + view_sliders="#969696"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#3c3b37" + list_text="#000000" + list_text_hi="#ffffff" + list_title="#000000"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeNLAEditor> + </nla_editor> + <node_editor> + <ThemeNodeEditor converter_node="#93be00" + group_node="#19b6ee" + in_out_node="#f40051" + node_backdrop="#52524ed1" + noodle_curving="5" + operator_node="#000000" + selected_text="#7f7070" + wire_select="#f4b696" + wire="#f45b00"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#353430" + button_text="#acacac" + button_text_hi="#ffffff" + button_title="#acacac" + text="#eeedeb" + text_hi="#cbcbcb" + title="#000000" + back="#29001b"> + </ThemeSpaceGeneric> + </space> + <space_list> + <ThemeSpaceListGeneric list="#3c3b37" + list_text="#acacac" + list_text_hi="#ffffff" + list_title="#acacac"> + </ThemeSpaceListGeneric> + </space_list> + </ThemeNodeEditor> + </node_editor> + <outliner> + <ThemeOutliner match="#337f33" + selected_highlight="#6a3859"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#000000" + button_text_hi="#f47421" + button_title="#000000" + text="#cccccc" + text_hi="#f47421" + title="#000000" + back="#3c3b37"> + </ThemeSpaceGeneric> + </space> + </ThemeOutliner> + </outliner> + <properties> + <ThemeProperties panel="#3c3b37"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#acacac" + text_hi="#ffffff" + title="#acacac" + back="#3c3b37"> + </ThemeSpaceGeneric> + </space> + </ThemeProperties> + </properties> + <sequence_editor> + <ThemeSequenceEditor audio_strip="#2e8f8f" + frame_current="#c06e11" + draw_action="#50c8ff" + effect_strip="#a9547c" + grid="#282828" + image_strip="#6d5881" + keyframe="#f47421" + meta_strip="#6d9183" + movie_strip="#516987" + plugin_strip="#7e7e50" + scene_strip="#4e983e" + transition_strip="#a25f6f" + window_sliders="#a0a0a0"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#000000" + text_hi="#ffffff" + title="#000000" + back="#191919"> + </ThemeSpaceGeneric> + </space> + </ThemeSequenceEditor> + </sequence_editor> + <text_editor> + <ThemeTextEditor cursor="#df5106" + line_numbers_background="#3c3b37" + scroll_bar="#696965" + selected_text="#ffffff" + syntax_builtin="#df3ac2" + syntax_comment="#249d60" + syntax_numbers="#3c68ff" + syntax_special="#8c8c28" + syntax_string="#aa2694"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#191919" + button_text="#95948f" + button_text_hi="#ffffff" + button_title="#64645e" + text="#19b6ee" + text_hi="#ffffff" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + </ThemeTextEditor> + </text_editor> + <timeline> + <ThemeTimeline frame_current="#f47421" + grid="#272727"> + <space> + <ThemeSpaceGeneric header="#464541" + header_text="#000000" + header_text_hi="#ffffff" + button="#3c3b37" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#949494" + text_hi="#ffffff" + title="#000000" + back="#131311"> + </ThemeSpaceGeneric> + </space> + </ThemeTimeline> + </timeline> + <user_interface> + <ThemeUserInterface icon_alpha="1" + icon_file=""> + <wcol_box> + <ThemeWidgetColors inner="#252522ff" + inner_sel="#646464ff" + item="#0d0d0dff" + outline="#0d0d0d" + shadedown="0" + shadetop="-5" + show_shaded="TRUE" + text="#eeedeb" + text_sel="#eeedeb"> + </ThemeWidgetColors> + </wcol_box> + <wcol_list_item> + <ThemeWidgetColors inner="#00000000" + inner_sel="#6a3859ff" + item="#cbc3bbff" + outline="#0d0d0d" + shadedown="1" + shadetop="0" + show_shaded="FALSE" + text="#cbc3bb" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_list_item> + <wcol_menu_back> + <ThemeWidgetColors inner="#131312db" + inner_sel="#2d2d2de6" + item="#cbc3bbff" + outline="#0d0d0d" + shadedown="-20" + shadetop="25" + show_shaded="FALSE" + text="#7a7a7a" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_menu_back> + <wcol_menu_item> + <ThemeWidgetColors inner="#00000000" + inner_sel="#6a3859ff" + item="#ffffffff" + outline="#0d0d0d" + shadedown="0" + shadetop="38" + show_shaded="FALSE" + text="#a4a4a4" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_menu_item> + <wcol_menu> + <ThemeWidgetColors inner="#3c3b37ff" + inner_sel="#121212ff" + item="#ffffffff" + outline="#0d0d0d" + shadedown="-10" + shadetop="10" + show_shaded="TRUE" + text="#dfdbcf" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_menu> + <wcol_num> + <ThemeWidgetColors inner="#3c3b37ff" + inner_sel="#171717ff" + item="#ffffffff" + outline="#080808" + shadedown="-20" + shadetop="20" + show_shaded="TRUE" + text="#dfdbcf" + text_sel="#fffbed"> + </ThemeWidgetColors> + </wcol_num> + <wcol_option> + <ThemeWidgetColors inner="#272727ff" + inner_sel="#080808ff" + item="#fff8ecff" + outline="#0d0d0d" + shadedown="-5" + shadetop="15" + show_shaded="TRUE" + text="#84817e" + text_sel="#dfdbcf"> + </ThemeWidgetColors> + </wcol_option> + <panel> + <ThemePanelColors header="#00000000" + show_header="TRUE"> + </ThemePanelColors> + </panel> + <wcol_progress> + <ThemeWidgetColors inner="#00000000" + inner_sel="#00000000" + item="#00000000" + outline="#000000" + shadedown="0" + shadetop="0" + show_shaded="FALSE" + text="#cbc3bb" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_progress> + <wcol_pulldown> + <ThemeWidgetColors inner="#3f3f3fff" + inner_sel="#f47421ff" + item="#ffffffff" + outline="#0d0d0d" + shadedown="-20" + shadetop="25" + show_shaded="FALSE" + text="#dddddd" + text_sel="#fff7fb"> + </ThemeWidgetColors> + </wcol_pulldown> + <wcol_radio> + <ThemeWidgetColors inner="#1a1a1aff" + inner_sel="#6a3859ff" + item="#3c3b37ff" + outline="#000000" + shadedown="-5" + shadetop="5" + show_shaded="TRUE" + text="#dfdbcf" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_radio> + <wcol_regular> + <ThemeWidgetColors inner="#3c3b37ff" + inner_sel="#131311ff" + item="#cbc3bbff" + outline="#000000" + shadedown="-21" + shadetop="21" + show_shaded="TRUE" + text="#dfdfdf" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_regular> + <wcol_scroll> + <ThemeWidgetColors inner="#020202b4" + inner_sel="#646464c6" + item="#2c2b28ff" + outline="#0d0d0d" + shadedown="-5" + shadetop="5" + show_shaded="TRUE" + text="#cbc3bb" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_scroll> + <wcol_numslider> + <ThemeWidgetColors inner="#181818ff" + inner_sel="#151515ff" + item="#6a3859ff" + outline="#0d0d0d" + shadedown="26" + shadetop="-22" + show_shaded="TRUE" + text="#eeedeb" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_numslider> + <wcol_state> + <ThemeWidgetStateColors inner_anim="#308d00" + inner_anim_sel="#a7ff07" + blend="0.1" + inner_driven="#862074" + inner_driven_sel="#862074" + inner_key="#105874" + inner_key_sel="#19b6ee"> + </ThemeWidgetStateColors> + </wcol_state> + <wcol_text> + <ThemeWidgetColors inner="#272725ff" + inner_sel="#171717ff" + item="#6a3859ff" + outline="#0d0d0d" + shadedown="0" + shadetop="-10" + show_shaded="TRUE" + text="#dfdbcf" + text_sel="#fffaec"> + </ThemeWidgetColors> + </wcol_text> + <wcol_toggle> + <ThemeWidgetColors inner="#464640ff" + inner_sel="#151515ff" + item="#cbc3bbff" + outline="#000000" + shadedown="-3" + shadetop="7" + show_shaded="TRUE" + text="#c3bfb7" + text_sel="#ffffff"> + </ThemeWidgetColors> + </wcol_toggle> + <wcol_tool> + <ThemeWidgetColors inner="#3c3b37ff" + inner_sel="#3c3b37ff" + item="#cbc3bbff" + outline="#000000" + shadedown="-17" + shadetop="17" + show_shaded="TRUE" + text="#dfdbcf" + text_sel="#f47421"> + </ThemeWidgetColors> + </wcol_tool> + </ThemeUserInterface> + </user_interface> + <user_preferences> + <ThemeUserPreferences> + <space> + <ThemeSpaceGeneric header="#3c3b37" + header_text="#d3d2cd" + header_text_hi="#ffffff" + button="#696965" + button_text="#000000" + button_text_hi="#ffffff" + button_title="#000000" + text="#ccccc8" + text_hi="#ffffff" + title="#000000" + back="#3c3b37"> + </ThemeSpaceGeneric> + </space> + </ThemeUserPreferences> + </user_preferences> + <bone_color_sets> + <ThemeBoneColorSet active="#f74700" + show_colored_constraints="FALSE" + normal="#9a2400" + select="#bd3000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#ff9248" + show_colored_constraints="FALSE" + normal="#ff5d06" + select="#ff7b20"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#c9ef1d" + show_colored_constraints="FALSE" + normal="#7f9103" + select="#a8b700"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#95f5ff" + show_colored_constraints="FALSE" + normal="#19a3d5" + select="#00d9ee"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#f05d91" + show_colored_constraints="TRUE" + normal="#a9294e" + select="#c1416a"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#8764d5" + show_colored_constraints="FALSE" + normal="#430c78" + select="#543aa3"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#6fb6ab" + show_colored_constraints="FALSE" + normal="#24785a" + select="#3c9579"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#9bc2cd" + show_colored_constraints="FALSE" + normal="#4b707c" + select="#6a8691"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#f3ff00" + show_colored_constraints="FALSE" + normal="#f4c90c" + select="#eec236"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#ffffff" + show_colored_constraints="FALSE" + normal="#1e2024" + select="#484c56"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#d330d6" + show_colored_constraints="FALSE" + normal="#6f2f6a" + select="#9845be"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#bbef5b" + show_colored_constraints="FALSE" + normal="#6c8e22" + select="#7fb022"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#dedede" + show_colored_constraints="FALSE" + normal="#8d8d8d" + select="#b0b0b0"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#bd6a11" + show_colored_constraints="FALSE" + normal="#834326" + select="#8b5811"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#34622b" + show_colored_constraints="FALSE" + normal="#08310e" + select="#1c430b"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + <ThemeBoneColorSet active="#000000" + show_colored_constraints="FALSE" + normal="#000000" + select="#000000"> + </ThemeBoneColorSet> + </bone_color_sets> + </Theme> +</bpy> diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index fea7b9673ec..9dc6c62a9e0 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -496,7 +496,7 @@ class RENDER_PT_output(RenderButtonsPanel, Panel): subsplit = split.split() col = subsplit.column() - if rquicktime.audiocodec_type == 'AAC': + if quicktime.audiocodec_type == 'AAC': col.prop(quicktime, "audio_codec_isvbr") col = subsplit.column() diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index d18a71d3c55..0790896da0d 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -523,31 +523,12 @@ void build_seqar_cb(ListBase *seqbase, Sequence ***seqar, int *totseq, } -void calc_sequence_disp(Scene *scene, Sequence *seq) -{ - if(seq->startofs && seq->startstill) seq->startstill= 0; - if(seq->endofs && seq->endstill) seq->endstill= 0; - - seq->startdisp= seq->start + seq->startofs - seq->startstill; - seq->enddisp= seq->start+seq->len - seq->endofs + seq->endstill; - - seq->handsize= 10.0; /* 10 frames */ - if( seq->enddisp-seq->startdisp < 10 ) { - seq->handsize= (float)(0.5*(seq->enddisp-seq->startdisp)); - } - else if(seq->enddisp-seq->startdisp > 250) { - seq->handsize= (float)((seq->enddisp-seq->startdisp)/25); - } - - seq_update_sound_bounds(scene, seq); -} - static void seq_update_sound_bounds_recursive(Scene *scene, Sequence *metaseq) { Sequence *seq; /* for sound we go over full meta tree to update bounds of the sound strips, - since sound is played outside of evaluating the imbufs, */ + * since sound is played outside of evaluating the imbufs, */ for(seq=metaseq->seqbase.first; seq; seq=seq->next) { if(seq->type == SEQ_META) { seq_update_sound_bounds_recursive(scene, seq); @@ -567,6 +548,29 @@ static void seq_update_sound_bounds_recursive(Scene *scene, Sequence *metaseq) } } +void calc_sequence_disp(Scene *scene, Sequence *seq) +{ + if(seq->startofs && seq->startstill) seq->startstill= 0; + if(seq->endofs && seq->endstill) seq->endstill= 0; + + seq->startdisp= seq->start + seq->startofs - seq->startstill; + seq->enddisp= seq->start+seq->len - seq->endofs + seq->endstill; + + seq->handsize= 10.0; /* 10 frames */ + if( seq->enddisp-seq->startdisp < 10 ) { + seq->handsize= (float)(0.5*(seq->enddisp-seq->startdisp)); + } + else if(seq->enddisp-seq->startdisp > 250) { + seq->handsize= (float)((seq->enddisp-seq->startdisp)/25); + } + + if(ELEM(seq->type, SEQ_SOUND, SEQ_SCENE)) { + seq_update_sound_bounds(scene, seq); + } + else if(seq->type == SEQ_META) + seq_update_sound_bounds_recursive(scene, seq); +} + void calc_sequence(Scene *scene, Sequence *seq) { Sequence *seqm; @@ -2576,8 +2580,8 @@ static void seq_stop_threads() seq_thread_shutdown = TRUE; - pthread_cond_broadcast(&wakeup_cond); - pthread_mutex_unlock(&wakeup_lock); + pthread_cond_broadcast(&wakeup_cond); + pthread_mutex_unlock(&wakeup_lock); for(tslot = running_threads.first; tslot; tslot= tslot->next) { pthread_join(tslot->pthread, NULL); diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index bae4d9c4b4e..c4c3eb4a8b2 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -1244,7 +1244,7 @@ static void ffmpeg_set_expert_options(RenderData *rd) * The other options were taken from the libx264-default.preset * included in the ffmpeg distribution. */ - ffmpeg_property_add_string(rd, "video", "flags:loop"); +// ffmpeg_property_add_string(rd, "video", "flags:loop"); // this breakes compatibility for QT ffmpeg_property_add_string(rd, "video", "cmp:chroma"); ffmpeg_property_add_string(rd, "video", "partitions:parti4x4"); ffmpeg_property_add_string(rd, "video", "partitions:partp8x8"); diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 360b58eb0a9..c912bce1c77 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -2657,8 +2657,13 @@ void uiPupBlockOperator(bContext *C, uiBlockCreateFunc func, wmOperator *op, int void uiPupBlockClose(bContext *C, uiBlock *block) { if(block->handle) { - UI_remove_popup_handlers(&CTX_wm_window(C)->modalhandlers, block->handle); - ui_popup_block_free(C, block->handle); + wmWindow *win = CTX_wm_window(C); + + /* if loading new .blend while popup is open, window will be NULL */ + if(win) { + UI_remove_popup_handlers(&win->modalhandlers, block->handle); + ui_popup_block_free(C, block->handle); + } } } diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index a7ac91d13df..b8cc749888c 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1517,7 +1517,7 @@ void OBJECT_OT_game_property_new(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", gameproperty_type_items, 2, "Type", "Type of game property to add"); + RNA_def_enum(ot->srna, "type", gameproperty_type_items, GPROP_FLOAT, "Type", "Type of game property to add"); RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Name of the game property to add"); } diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index e88664ac817..ef1c86b0e84 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -2555,12 +2555,12 @@ void SEQUENCER_OT_rendersize(wmOperatorType *ot) /* properties */ } -static void seq_del_sound(Scene *scene, Sequence *seq) +static void seq_copy_del_sound(Scene *scene, Sequence *seq) { if(seq->type == SEQ_META) { Sequence *iseq; for(iseq= seq->seqbase.first; iseq; iseq= iseq->next) { - seq_del_sound(scene, iseq); + seq_copy_del_sound(scene, iseq); } } else if(seq->scene_sound) { @@ -2611,7 +2611,7 @@ static int sequencer_copy_exec(bContext *C, wmOperator *op) /* Need to remove anything that references the current scene */ for(seq= seqbase_clipboard.first; seq; seq= seq->next) { - seq_del_sound(scene, seq); + seq_copy_del_sound(scene, seq); } return OPERATOR_FINISHED; @@ -2634,6 +2634,19 @@ void SEQUENCER_OT_copy(wmOperatorType *ot) /* properties */ } +static void seq_paste_add_sound(Scene *scene, Sequence *seq) +{ + if(seq->type == SEQ_META) { + Sequence *iseq; + for(iseq= seq->seqbase.first; iseq; iseq= iseq->next) { + seq_paste_add_sound(scene, iseq); + } + } + else if(seq->type == SEQ_SOUND) { + seq->scene_sound = sound_add_scene_sound_defaults(scene, seq); + } +} + static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene= CTX_data_scene(C); @@ -2660,9 +2673,13 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op)) BLI_movelisttolist(ed->seqbasep, &nseqbase); /* make sure the pasted strips have unique names between them */ - for(; iseq; iseq=iseq->next) + for(; iseq; iseq=iseq->next) { seq_recursive_apply(iseq, apply_unique_name_cb, scene); + /* restore valid sound_scene for newly added strips */ + seq_paste_add_sound(scene, iseq); + } + WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); return OPERATOR_FINISHED; diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 926faeb417e..7a61ee2eebc 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -518,6 +518,8 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int IMB_buffer_float_from_float(srgb_frect, ibuf->rect_float, ibuf->channels, IB_PROFILE_SRGB, ibuf->profile, 0, ibuf->x, ibuf->y, ibuf->x, ibuf->x); + /* clamp buffer colours to 1.0 to avoid artifacts due to glu for hdr images */ + IMB_buffer_float_clamp(srgb_frect, ibuf->x, ibuf->y); frect= srgb_frect + texwinsy*ibuf->x + texwinsx; } else @@ -541,6 +543,8 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int IMB_buffer_float_from_float(srgb_frect, ibuf->rect_float, ibuf->channels, IB_PROFILE_SRGB, ibuf->profile, 0, ibuf->x, ibuf->y, ibuf->x, ibuf->x); + /* clamp buffer colours to 1.0 to avoid artifacts due to glu for hdr images */ + IMB_buffer_float_clamp(srgb_frect, ibuf->x, ibuf->y); } else frect= ibuf->rect_float; @@ -615,7 +619,7 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int if (!(gpu_get_mipmap() && mipmap)) { if(use_high_bit_depth) - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16, rectw, recth, 0, GL_RGBA, GL_FLOAT, frect); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16, rectw, recth, 0, GL_RGBA, GL_FLOAT, frect); else glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, rectw, recth, 0, GL_RGBA, GL_UNSIGNED_BYTE, rect); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); @@ -732,6 +736,8 @@ void GPU_paint_set_mipmap(int mipmap) else GPU_free_image(ima); } + else + ima->tpageflag &= ~IMA_MIPMAP_COMPLETE; } } @@ -742,6 +748,8 @@ void GPU_paint_set_mipmap(int mipmap) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1)); } + else + ima->tpageflag &= ~IMA_MIPMAP_COMPLETE; } } } @@ -939,7 +947,6 @@ void GPU_free_image(Image *ima) if(ima->bindcode) { glDeleteTextures(1, (GLuint *)&ima->bindcode); ima->bindcode= 0; - ima->tpageflag &= ~IMA_MIPMAP_COMPLETE; } /* free glsl image binding */ @@ -954,8 +961,9 @@ void GPU_free_image(Image *ima) MEM_freeN(ima->repbind); ima->repbind= NULL; - ima->tpageflag &= ~IMA_MIPMAP_COMPLETE; } + + ima->tpageflag &= ~IMA_MIPMAP_COMPLETE; } void GPU_free_images(void) diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index 996bfd35581..07f1b9e4683 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -391,6 +391,7 @@ void IMB_buffer_float_from_float(float *rect_to, const float *rect_from, void IMB_buffer_byte_from_byte(unsigned char *rect_to, const unsigned char *rect_from, int profile_to, int profile_from, int predivide, int width, int height, int stride_to, int stride_from); +void IMB_buffer_float_clamp(float *buf, int width, int height); /** * Change the ordering of the color bytes pointed to by rect from diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index a8ca282de66..d9ec3bf60c6 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -742,3 +742,10 @@ void IMB_color_to_bw(ImBuf *ibuf) rct[0]= rct[1]= rct[2]= rgb_to_grayscale_byte(rct); } } + +void IMB_buffer_float_clamp(float *buf, int width, int height){ + int i, total = width*height*4; + for(i = 0; i < total; i++){ + buf[i] = MIN2(1.0, buf[i]); + } +} diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 9a94a98bfaf..7dc721930ef 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -823,16 +823,16 @@ static void rna_SceneRender_file_ext_get(PointerRNA *ptr, char *str) #ifdef WITH_QUICKTIME static int rna_RenderSettings_qtcodecsettings_codecType_get(PointerRNA *ptr) { - RenderData *rd= (RenderData*)ptr->data; + QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data; - return quicktime_rnatmpvalue_from_videocodectype(rd->qtcodecsettings.codecType); + return quicktime_rnatmpvalue_from_videocodectype(settings->codecType); } static void rna_RenderSettings_qtcodecsettings_codecType_set(PointerRNA *ptr, int value) { - RenderData *rd= (RenderData*)ptr->data; + QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data; - rd->qtcodecsettings.codecType = quicktime_videocodecType_from_rnatmpvalue(value); + settings->codecType = quicktime_videocodecType_from_rnatmpvalue(value); } static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bContext *C, PointerRNA *ptr, @@ -865,16 +865,16 @@ static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bCon #ifdef USE_QTKIT static int rna_RenderSettings_qtcodecsettings_audiocodecType_get(PointerRNA *ptr) { - RenderData *rd= (RenderData*)ptr->data; + QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data; - return quicktime_rnatmpvalue_from_audiocodectype(rd->qtcodecsettings.audiocodecType); + return quicktime_rnatmpvalue_from_audiocodectype(settings->audiocodecType); } static void rna_RenderSettings_qtcodecsettings_audiocodecType_set(PointerRNA *ptr, int value) { - RenderData *rd= (RenderData*)ptr->data; + QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data; - rd->qtcodecsettings.audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value); + settings->audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value); } static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_audiocodecType_itemf(bContext *C, PointerRNA *ptr, diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 993c0ca0bde..aff8a85dd26 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -546,6 +546,7 @@ static void rna_def_trackingSettings(BlenderRNA *brna) prop= RNA_def_property(srna, "distance", PROP_FLOAT, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_float_sdna(prop, NULL, "dist"); + RNA_def_property_float_default(prop, 1.0f); RNA_def_property_ui_text(prop, "Distance", "Distance between two bundles used for scene scaling"); /* frames count */ @@ -665,6 +666,7 @@ static void rna_def_trackingSettings(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "object_distance"); RNA_def_property_ui_text(prop, "Distance", "Distance between two bundles used for object scaling"); RNA_def_property_range(prop, 0.001, 10000); + RNA_def_property_float_default(prop, 1.0f); RNA_def_property_ui_range(prop, 0.001, 10000.0, 1, 3); } @@ -1227,6 +1229,7 @@ static void rna_def_trackingObject(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "scale"); RNA_def_property_range(prop, 0.0001f, 10000.0f); RNA_def_property_ui_range(prop, 0.0001f, 10000.0, 1, 4); + RNA_def_property_float_default(prop, 1.0f); RNA_def_property_ui_text(prop, "Scale", "Scale of object solution in camera space"); RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_trackingObject_flushUpdate"); } diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index 045ef973e91..f709572d0bb 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -595,8 +595,7 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R return success; } - -int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, ReportList *reports) +int append_qt(struct RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, ReportList *reports) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSBitmapImageRep *blBitmapFormatImage; @@ -604,14 +603,12 @@ int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int rect OSStatus err = noErr; unsigned char *from_Ptr,*to_Ptr; int y,from_i,to_i; - BOOL alpha = (rd->im_format.planes == R_IMF_PLANES_RGBA)? YES: NO; - /* Create bitmap image rep in blender format (32bit RGBA) */ blBitmapFormatImage = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:rectx pixelsHigh:recty - bitsPerSample:8 samplesPerPixel:4 hasAlpha:alpha isPlanar:NO + bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bitmapFormat:NSAlphaNonpremultipliedBitmapFormat bytesPerRow:rectx*4 diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 4c2bcee0150..633d92e05c1 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -86,6 +86,9 @@ int anim_is_quicktime (const char *name) BLI_testextensie(name, ".txt") || BLI_testextensie(name, ".mpg") || BLI_testextensie(name, ".avi") || // wouldnt be appropriate ;) + BLI_testextensie(name, ".mov") || // disabled, suboptimal decoding speed + BLI_testextensie(name, ".mp4") || // disabled, suboptimal decoding speed + BLI_testextensie(name, ".m4v") || // disabled, suboptimal decoding speed BLI_testextensie(name, ".tga") || BLI_testextensie(name, ".png") || BLI_testextensie(name, ".bmp") || diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 101fcc0a732..71cf87517f5 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -604,7 +604,7 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R } -int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, ReportList *reports) +int append_qt(struct RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, ReportList *reports) { QT_DoAddVideoSamplesToMedia(frame, pixels, rectx, recty, reports); return 1; diff --git a/source/blender/quicktime/quicktime_export.h b/source/blender/quicktime/quicktime_export.h index 71827b1e202..deaacb0ce39 100644 --- a/source/blender/quicktime/quicktime_export.h +++ b/source/blender/quicktime/quicktime_export.h @@ -57,7 +57,7 @@ struct Scene; struct wmOperatorType; int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports); //for movie handle (BKE writeavi.c now) -int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, struct ReportList *reports); +int append_qt(struct RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, struct ReportList *reports); void end_qt(void); void filepath_qt(char *string, struct RenderData *rd); diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index b91080fa56e..19b3c6616ac 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -398,12 +398,21 @@ if(UNIX AND NOT APPLE) if(WITH_PYTHON) if(WITH_PYTHON_INSTALL) + # on some platforms (like openSUSE) Python is linked + # to be used from lib64 folder. + # determine this from Python's libraries path + if(${PYTHON_LIBPATH} MATCHES "lib64$") + set(_target_LIB "lib64") + else() + set(_target_LIB "lib") + endif() + # Copy the systems python into the install directory # Scons copy in tools/Blender.py # install(CODE "message(\"copying a subset of the systems python...\")") install( DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION} - DESTINATION ${TARGETDIR_VER}/python/lib + DESTINATION ${TARGETDIR_VER}/python/${_target_LIB} PATTERN ".svn" EXCLUDE PATTERN "__pycache__" EXCLUDE # * any cache * PATTERN "distutils" EXCLUDE # ./distutils @@ -421,6 +430,7 @@ if(UNIX AND NOT APPLE) # # doesnt work, todo # install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')") + unset(_target_LIB) endif() endif() elseif(WIN32) diff --git a/source/gameengine/Converter/BL_ShapeDeformer.cpp b/source/gameengine/Converter/BL_ShapeDeformer.cpp index fb0a86d6084..bb3636881ea 100644 --- a/source/gameengine/Converter/BL_ShapeDeformer.cpp +++ b/source/gameengine/Converter/BL_ShapeDeformer.cpp @@ -50,6 +50,8 @@ #include "DNA_meshdata_types.h" #include "BKE_armature.h" #include "BKE_action.h" +#include "BKE_global.h" +#include "BKE_main.h" #include "BKE_key.h" #include "BKE_ipo.h" #include "MT_Point3.h" @@ -97,10 +99,13 @@ BL_ShapeDeformer::BL_ShapeDeformer(BL_DeformableGameObject *gameobj, BL_ShapeDeformer::~BL_ShapeDeformer() { - if (m_key && m_bmesh->key) + if (m_key && m_bmesh->key && m_key != m_bmesh->key) { free_key(m_bmesh->key); + BLI_remlink_safe(&G.main->key, m_bmesh->key); + MEM_freeN(m_bmesh->key); m_bmesh->key = m_key; + m_key = NULL; } }; diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index 55e3220c08c..54e2efd8776 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp @@ -291,6 +291,29 @@ void GPC_RenderTools::RenderText3D( int fontid, double* mat, float aspect) { + if(GLEW_ARB_multitexture) { + for(int i=0; i<MAXTEX; i++) { + glActiveTextureARB(GL_TEXTURE0_ARB+i); + + if(GLEW_ARB_texture_cube_map) + if(glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB)) + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + + if(glIsEnabled(GL_TEXTURE_2D)) + glDisable(GL_TEXTURE_2D); + } + + glActiveTextureARB(GL_TEXTURE0_ARB); + } + else { + if(GLEW_ARB_texture_cube_map) + if(glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB)) + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + + if(glIsEnabled(GL_TEXTURE_2D)) + glDisable(GL_TEXTURE_2D); + } + /* the actual drawing */ glColor4fv(color); |