Merged changes in the trunk up to revision 36301.

This commit is contained in:
2011-04-23 22:08:18 +00:00
350 changed files with 5378 additions and 5206 deletions

View File

@@ -31,15 +31,20 @@
# build the libs and objects in it. # build the libs and objects in it.
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
message(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! if(NOT DEFINED WITH_IN_SOURCE_BUILD)
Remove the CMakeCache.txt file and try again from another folder, e.g.: message(FATAL_ERROR
"CMake generation for blender is not allowed within the source directory!"
rm CMakeCache.txt "\n Remove the CMakeCache.txt file and try again from another folder, e.g.:"
cd .. "\n "
mkdir cmake-make "\n rm CMakeCache.txt"
cd cmake-make "\n cd .."
cmake ../blender "\n mkdir cmake-make"
") "\n cd cmake-make"
"\n cmake ../blender"
"\n "
"\n Alternately define WITH_IN_SOURCE_BUILD to force this option (not recommended!)"
)
endif()
endif() endif()
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)

View File

@@ -47,7 +47,6 @@ WITH_BF_ZLIB = True
WITH_BF_STATICZLIB = True WITH_BF_STATICZLIB = True
BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a' BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
WITH_BF_STATICZLIB = False
WITH_BF_SDL = True WITH_BF_SDL = True
WITH_BF_OGG = False WITH_BF_OGG = False

View File

@@ -172,7 +172,8 @@ static const char* fileopen_error = "AUD_FFMPEGReader: File couldn't be "
AUD_FFMPEGReader::AUD_FFMPEGReader(std::string filename) : AUD_FFMPEGReader::AUD_FFMPEGReader(std::string filename) :
m_pkgbuf(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1), m_pkgbuf(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1),
m_byteiocontext(NULL) m_byteiocontext(NULL),
m_membuf(NULL)
{ {
// open file // open file
if(av_open_input_file(&m_formatCtx, filename.c_str(), NULL, 0, NULL)!=0) if(av_open_input_file(&m_formatCtx, filename.c_str(), NULL, 0, NULL)!=0)
@@ -194,12 +195,15 @@ static const char* streamopen_error = "AUD_FFMPEGReader: Stream couldn't be "
AUD_FFMPEGReader::AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer) : AUD_FFMPEGReader::AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer) :
m_pkgbuf(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1), m_pkgbuf(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1),
m_membuffer(buffer) m_membuffer(buffer),
m_membufferpos(0)
{ {
m_byteiocontext = (ByteIOContext*)av_mallocz(sizeof(ByteIOContext)); m_membuf = reinterpret_cast<data_t*>(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE));
if(init_put_byte(m_byteiocontext, (data_t*)buffer.get()->getBuffer(), m_byteiocontext = av_alloc_put_byte(m_membuf, FF_MIN_BUFFER_SIZE, 0, this,
buffer.get()->getSize(), 0, NULL, NULL, NULL, NULL) != 0) read_packet, NULL, seek_packet);
if(!m_byteiocontext)
{ {
av_free(m_byteiocontext); av_free(m_byteiocontext);
AUD_THROW(AUD_ERROR_FILE, fileopen_error); AUD_THROW(AUD_ERROR_FILE, fileopen_error);
@@ -207,7 +211,7 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer) :
AVProbeData probe_data; AVProbeData probe_data;
probe_data.filename = ""; probe_data.filename = "";
probe_data.buf = (data_t*)buffer.get()->getBuffer(); probe_data.buf = reinterpret_cast<data_t*>(buffer.get()->getBuffer());
probe_data.buf_size = buffer.get()->getSize(); probe_data.buf_size = buffer.get()->getSize();
AVInputFormat* fmt = av_probe_input_format(&probe_data, 1); AVInputFormat* fmt = av_probe_input_format(&probe_data, 1);
@@ -243,6 +247,40 @@ AUD_FFMPEGReader::~AUD_FFMPEGReader()
av_close_input_file(m_formatCtx); av_close_input_file(m_formatCtx);
} }
int AUD_FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size)
{
AUD_FFMPEGReader* reader = reinterpret_cast<AUD_FFMPEGReader*>(opaque);
int size = AUD_MIN(buf_size, reader->m_membuffer.get()->getSize() - reader->m_membufferpos);
if(size < 0)
return -1;
memcpy(buf, ((data_t*)reader->m_membuffer.get()->getBuffer()) + reader->m_membufferpos, size);
reader->m_membufferpos += size;
return size;
}
int64_t AUD_FFMPEGReader::seek_packet(void* opaque, int64_t offset, int whence)
{
AUD_FFMPEGReader* reader = reinterpret_cast<AUD_FFMPEGReader*>(opaque);
switch(whence)
{
case SEEK_SET:
reader->m_membufferpos = 0;
break;
case SEEK_END:
reader->m_membufferpos = reader->m_membuffer.get()->getSize();
break;
case AVSEEK_SIZE:
return reader->m_membuffer.get()->getSize();
}
return (reader->m_membufferpos += offset);
}
bool AUD_FFMPEGReader::isSeekable() const bool AUD_FFMPEGReader::isSeekable() const
{ {
return true; return true;

View File

@@ -106,10 +106,20 @@ private:
AUD_convert_f m_convert; AUD_convert_f m_convert;
/** /**
* The memory file to read from, only saved to keep the buffer alive. * The memory file to read from.
*/ */
AUD_Reference<AUD_Buffer> m_membuffer; AUD_Reference<AUD_Buffer> m_membuffer;
/**
* The buffer to read with.
*/
data_t* m_membuf;
/**
* Reading position of the buffer.
*/
int64_t m_membufferpos;
/** /**
* Decodes a packet into the given buffer. * Decodes a packet into the given buffer.
* \param packet The AVPacket to decode. * \param packet The AVPacket to decode.
@@ -149,6 +159,9 @@ public:
*/ */
virtual ~AUD_FFMPEGReader(); virtual ~AUD_FFMPEGReader();
static int read_packet(void* opaque, uint8_t* buf, int buf_size);
static int64_t seek_packet(void* opaque, int64_t offset, int whence);
virtual bool isSeekable() const; virtual bool isSeekable() const;
virtual void seek(int position); virtual void seek(int position);
virtual int getLength() const; virtual int getLength() const;

View File

@@ -403,7 +403,7 @@ GHOST_TSuccess GHOST_GetModifierKeyState(GHOST_SystemHandle systemhandle,
{ {
GHOST_ISystem* system = (GHOST_ISystem*) systemhandle; GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
GHOST_TSuccess result; GHOST_TSuccess result;
bool isdown; bool isdown= false;
result = system->getModifierKeyState(mask, isdown); result = system->getModifierKeyState(mask, isdown);
*isDown = (int) isdown; *isDown = (int) isdown;
@@ -419,7 +419,7 @@ GHOST_TSuccess GHOST_GetButtonState(GHOST_SystemHandle systemhandle,
{ {
GHOST_ISystem* system = (GHOST_ISystem*) systemhandle; GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
GHOST_TSuccess result; GHOST_TSuccess result;
bool isdown; bool isdown= false;
result = system->getButtonState(mask, isdown); result = system->getButtonState(mask, isdown);
*isDown = (int) isdown; *isDown = (int) isdown;

View File

@@ -369,16 +369,16 @@ void *MEM_mapallocN(size_t len, const char *str)
{ {
#include <fcntl.h> #include <fcntl.h>
int fd; int fd;
fd = open("/dev/zero", O_RDWR); fd = open("/dev/zero", O_RDWR);
memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail), memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail),
PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
close(fd); close(fd);
} }
#else #else
memh= mmap(NULL, len+sizeof(MemHead)+sizeof(MemTail), memh= mmap(NULL, len+sizeof(MemHead)+sizeof(MemTail),
PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0); PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
#endif #endif
if(memh!=(MemHead *)-1) { if(memh!=(MemHead *)-1) {
@@ -698,26 +698,26 @@ static void remlink(volatile localListBase *listbase, void *vlink)
static void rem_memblock(MemHead *memh) static void rem_memblock(MemHead *memh)
{ {
remlink(membase,&memh->next); remlink(membase,&memh->next);
if (memh->prev) { if (memh->prev) {
if (memh->next) if (memh->next)
MEMNEXT(memh->prev)->nextname = MEMNEXT(memh->next)->name; MEMNEXT(memh->prev)->nextname = MEMNEXT(memh->next)->name;
else else
MEMNEXT(memh->prev)->nextname = NULL; MEMNEXT(memh->prev)->nextname = NULL;
} }
totblock--; totblock--;
mem_in_use -= memh->len; mem_in_use -= memh->len;
if(memh->mmap) { if(memh->mmap) {
mmap_in_use -= memh->len; mmap_in_use -= memh->len;
if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail))) if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
printf("Couldn't unmap memory %s\n", memh->name); printf("Couldn't unmap memory %s\n", memh->name);
} }
else { else {
if(malloc_debug_memset && memh->len) if(malloc_debug_memset && memh->len)
memset(memh+1, 255, memh->len); memset(memh+1, 255, memh->len);
free(memh); free(memh);
} }
} }
@@ -792,7 +792,7 @@ static const char *check_memlist(MemHead *memh)
forwok->nextname = backok->name; forwok->nextname = backok->name;
} else{ } else{
forwok->next = NULL; forwok->next = NULL;
membase->last = (struct localLink *) &forwok->next; membase->last = (struct localLink *) &forwok->next;
/* membase->last = (struct Link *) &forwok->next; */ /* membase->last = (struct Link *) &forwok->next; */
} }
} else{ } else{

View File

@@ -114,7 +114,7 @@ void *mmap(void *UNUSED(start), size_t len, int prot, int flags, int fd, off_t o
/* /*
if ( fd == -1 ) { if ( fd == -1 ) {
_set_errno( EBADF ); _set_errno( EBADF );
return MAP_FAILED; return MAP_FAILED;
} }
*/ */
@@ -128,16 +128,16 @@ void *mmap(void *UNUSED(start), size_t len, int prot, int flags, int fd, off_t o
} }
} else { } else {
if ( !DuplicateHandle( GetCurrentProcess(), fhandle, GetCurrentProcess(), if ( !DuplicateHandle( GetCurrentProcess(), fhandle, GetCurrentProcess(),
&fhandle, 0, FALSE, DUPLICATE_SAME_ACCESS ) ) { &fhandle, 0, FALSE, DUPLICATE_SAME_ACCESS ) ) {
return MAP_FAILED; return MAP_FAILED;
} }
} }
maphandle = CreateFileMapping(fhandle, NULL, prot_flags, 0, len, NULL); maphandle = CreateFileMapping(fhandle, NULL, prot_flags, 0, len, NULL);
if ( maphandle == 0 ) { if ( maphandle == 0 ) {
errno = EBADF; errno = EBADF;
return MAP_FAILED; return MAP_FAILED;
} }
ptr = MapViewOfFile(maphandle, access_flags, 0, offset, 0); ptr = MapViewOfFile(maphandle, access_flags, 0, offset, 0);
if ( ptr == NULL ) { if ( ptr == NULL ) {
@@ -159,7 +159,7 @@ void *mmap(void *UNUSED(start), size_t len, int prot, int flags, int fd, off_t o
mm->mmap = ptr; mm->mmap = ptr;
mmap_addtail(mmapbase, mm); mmap_addtail(mmapbase, mm);
return ptr; return ptr;
} }
/* munmap for windows */ /* munmap for windows */
@@ -168,14 +168,14 @@ intptr_t munmap(void *ptr, intptr_t UNUSED(size))
MemMap *mm = mmap_findlink(mmapbase, ptr); MemMap *mm = mmap_findlink(mmapbase, ptr);
if (!mm) { if (!mm) {
errno=EINVAL; errno=EINVAL;
return -1; return -1;
} }
UnmapViewOfFile( mm->mmap ); UnmapViewOfFile( mm->mmap );
CloseHandle( mm->maphandle ); CloseHandle( mm->maphandle );
CloseHandle( mm->fhandle); CloseHandle( mm->fhandle);
mmap_remlink(mmapbase, mm); mmap_remlink(mmapbase, mm);
free(mm); free(mm);
return 0; return 0;
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
@@ -233,16 +233,16 @@ static int mmap_get_prot_flags (int flags)
int prot = PAGE_NOACCESS; int prot = PAGE_NOACCESS;
if ( ( flags & PROT_READ ) == PROT_READ ) { if ( ( flags & PROT_READ ) == PROT_READ ) {
if ( ( flags & PROT_WRITE ) == PROT_WRITE ) { if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
} else { } else {
prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_READONLY; prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_READONLY;
} }
} else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) { } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_WRITECOPY; prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_WRITECOPY;
} else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) { } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
prot = PAGE_EXECUTE_READ; prot = PAGE_EXECUTE_READ;
} }
return prot; return prot;
} }
@@ -251,16 +251,16 @@ static int mmap_get_access_flags (int flags)
int access = 0; int access = 0;
if ( ( flags & PROT_READ ) == PROT_READ ) { if ( ( flags & PROT_READ ) == PROT_READ ) {
if ( ( flags & PROT_WRITE ) == PROT_WRITE ) { if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
access = FILE_MAP_WRITE; access = FILE_MAP_WRITE;
} else { } else {
access = (flags & PROT_EXEC) ? FILE_MAP_EXECUTE : FILE_MAP_READ; access = (flags & PROT_EXEC) ? FILE_MAP_EXECUTE : FILE_MAP_READ;
} }
} else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) { } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
access = FILE_MAP_COPY; access = FILE_MAP_COPY;
} else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) { } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
access = FILE_MAP_EXECUTE; access = FILE_MAP_EXECUTE;
} }
return access; return access;
} }

View File

@@ -60,7 +60,7 @@ int main (int argc, char *argv[])
int i = 0; int i = 0;
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
switch (argc) { switch (argc) {
case 2: case 2:
verbose = atoi(argv[1]); verbose = atoi(argv[1]);
if (verbose < 0) verbose = 0; if (verbose < 0) verbose = 0;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -1,249 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="128"
height="128"
id="svg7854"
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
version="1.0"
sodipodi:docname="blender.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:modified="true"
inkscape:export-filename="/home/user/my/blender/builds/blender/release/freedesktop/icons/128x128/blender.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs7856">
<linearGradient
inkscape:collect="always"
id="linearGradient39171">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39173" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop39175" />
</linearGradient>
<linearGradient
id="linearGradient39155">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39157" />
<stop
style="stop-color:#dadada;stop-opacity:1;"
offset="1"
id="stop39159" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35500">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop35502" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop35504" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35488">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop35490" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop35492" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3564">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3566" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop3568" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3564"
id="linearGradient34576"
gradientUnits="userSpaceOnUse"
x1="185.9903"
y1="193.33229"
x2="190.46461"
y2="-458.05771"
gradientTransform="matrix(0.06818845,0,0,0.06818845,22.51112,27.02885)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient35488"
id="radialGradient35494"
cx="28.019106"
cy="38.98439"
fx="28.019106"
fy="38.98439"
r="15.467961"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient35500"
id="linearGradient35506"
x1="21.204315"
y1="21.699249"
x2="20.155914"
y2="-26.908371"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient39155"
id="linearGradient39161"
x1="31.1875"
y1="18.875"
x2="29.875"
y2="34.375"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient39171"
id="radialGradient39177"
cx="26.109201"
cy="19.668886"
fx="26.109201"
fy="19.668886"
r="20.278975"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#e0e0e0"
borderopacity="1"
gridtolerance="10000"
guidetolerance="10"
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.871875"
inkscape:cx="80.235096"
inkscape:cy="49.468465"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="48px"
height="48px"
inkscape:showpageshadow="false"
inkscape:window-width="1046"
inkscape:window-height="975"
inkscape:window-x="345"
inkscape:window-y="0"
showgrid="false"
inkscape:window-maximized="0" />
<metadata
id="metadata7859">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:title></dc:title>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
<cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,80)">
<g
id="g3199"
transform="matrix(2.6773066,0,0,2.6773066,-2.8443369,-81.867322)">
<path
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
sodipodi:ry="5.3033009"
sodipodi:rx="15.467961"
sodipodi:cy="38.98439"
sodipodi:cx="28.019106"
id="path35486"
style="opacity:0.54857142;color:#000000;fill:url(#radialGradient35494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csssssssssscccsscccscccssccc"
d="m 16.048489,28.093447 c 0.0098,0.576682 0.196474,1.697902 0.471116,2.577425 0.581566,1.854137 1.56684,3.572658 2.939126,5.086496 1.407488,1.553118 3.138519,2.803227 5.139315,3.68976 2.105357,0.931573 4.384795,1.407488 6.750134,1.403741 2.365339,-0.005 4.644601,-0.488686 6.74896,-1.427017 2.00002,-0.895288 3.731043,-2.148391 5.13754,-3.705517 1.369207,-1.519844 2.352576,-3.241114 2.934089,-5.096258 0.294262,-0.938353 0.476921,-1.889392 0.553238,-2.845308 0.07331,-0.939306 0.04204,-1.883511 -0.09183,-2.823792 -0.259981,-1.835599 -0.896294,-3.556847 -1.872652,-5.12758 -0.895541,-1.441699 -2.047808,-2.70454 -3.417268,-3.766975 0,0 0.002,-0.002 0.002,-0.002 0,0 -13.828458,-10.6197195 -13.828458,-10.6197195 -0.01176,-0.00978 -0.02252,-0.019551 -0.03529,-0.028344 -0.909003,-0.6959264 -2.434775,-0.6939758 -3.431728,0.00488 -1.01067,0.7057021 -1.091821,1.8092613 -0.195527,2.5482146 1.899775,1.4997633 3.792068,3.0680399 5.702368,4.5676189 0,0 -17.551681,-0.01171 -17.551681,-0.01171 -1.994685,0 -3.1682604,0.947915 -3.4153942,2.333683 -0.2180771,1.222836 0.7479213,2.738129 2.4800212,2.738129 2.956573,0.0039 5.942111,-0.0069 8.909215,-0.01272 0,0 -15.901723,11.764162 -15.901723,11.764162 -0.020527,0.01564 -0.041053,0.02933 -0.06158,0.04497 -1.4974197,1.148389 -1.9831951,3.059322 -1.0399808,4.268393 0.9598323,1.22959 2.9977653,1.230588 4.5147288,0.006 0,0 8.677593,-7.102098 8.677593,-7.102098 0,0 -0.12511,0.959824 -0.116333,1.535532 z"
id="path2482"
style="fill:#f57900;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
transform="matrix(0.821621,0,0,0.839506,5.875686,3.882724)"
d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
sodipodi:ry="10.125"
sodipodi:rx="11.5625"
sodipodi:cy="25.75"
sodipodi:cx="31.1875"
id="path39153"
style="color:#000000;fill:url(#linearGradient39161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cssssscscczccsccssssccscccccscssc"
id="path3562"
d="m 25.796988,6.0267804 c -0.404852,5.53e-4 -0.818619,0.1256944 -1.095272,0.3196267 -7.14e-4,7.142e-4 -0.0014,0.00143 -0.0021,0.00213 -0.280209,0.1956525 -0.336859,0.3680061 -0.345206,0.4602725 -0.0083,0.092266 -0.01324,0.1672776 0.189655,0.3345475 0.01899,0.015735 0.03747,0.032076 0.0554,0.049009 0.124258,0.1010285 5.704394,4.6389489 5.704394,4.6389489 0.373658,0.304091 0.51584,0.810232 0.355197,1.264415 -0.160635,0.454191 -0.589422,0.382732 -1.071174,0.384283 -5.634142,0.05114 -17.60967,0.01918 -17.60967,0.01918 -0.952967,6.38e-4 -2.3472795,0.516793 -2.4135719,1.585761 -0.063562,1.024947 0.9093059,1.457499 1.5782589,1.457499 0,0 8.830403,-0.01705 8.830403,-0.01705 0.488364,-5.91e-4 0.922857,0.221532 1.080466,0.683755 0.15761,0.462231 0.0033,0.53156 -0.383664,0.829439 0,0 -15.9006939,12.205735 -15.9006939,12.205735 -0.00142,0.0014 -0.00284,0.0028 -0.00426,0.0043 -0.064038,0.04879 -0.084772,0.06226 -0.061795,0.04476 -0.5536756,0.424618 -0.8961097,0.98072 -1.0185711,1.476701 -0.1224537,0.495981 -0.04659,0.882548 0.1875202,1.182646 0.4788333,0.613413 1.7693735,0.732111 2.8980115,-0.178996 0,0 8.6727243,-7.09799 8.6727243,-7.09799 0.361955,-0.295752 0.867758,-0.340606 1.276111,-0.113169 0.408345,0.227437 0.636512,0.681082 0.575631,1.144518 0,0 -0.112502,0.980045 -0.10655,1.370159 0.192357,2.636407 1.448328,4.914995 3.115366,6.91474 2.877746,3.172809 6.84939,4.556285 11.042271,4.719919 4.20342,-0.04394 8.185784,-1.662428 11.042264,-4.758277 5.218918,-6.385867 3.941737,-13.3639 -1.747326,-17.993227 C 36.14442,13.301598 31.42752,9.8792062 26.81986,6.3400589 c -0.0043,-0.00352 -0.0086,-0.00707 -0.01279,-0.010651 -0.0072,-0.00489 -0.01427,-0.00987 -0.02131,-0.014921 -0.210578,-0.1612288 -0.584681,-0.288267 -0.988772,-0.2877065 z"
style="opacity:0.4857143;fill:none;stroke:url(#linearGradient34576);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m 26.007076,24.754048 c 0.07447,-1.361157 0.739293,-2.562655 1.738705,-3.413271 0.983518,-0.836183 2.304215,-1.346747 3.746876,-1.346747 1.441743,0 2.762441,0.510564 3.745729,1.346747 1.000515,0.850616 1.664539,2.051213 1.739875,3.41237 0.07718,1.400852 -0.4828,2.701576 -1.46425,3.66495 -1.000516,0.981409 -2.427099,1.597503 -4.021354,1.597503 -1.595172,0 -3.021756,-0.616094 -4.022225,-1.597503 -0.982461,-0.963374 -1.540507,-2.264098 -1.463356,-3.664049 z"
id="path2478"
style="fill:#3465a4;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="csssscsccsscsccssssscsscccsssc"
id="path39166"
d="m 25.8125,6.03125 c -0.404852,5.528e-4 -0.848347,0.1185677 -1.125,0.3125 -0.280209,0.1956523 -0.335403,0.3764836 -0.34375,0.46875 -0.0083,0.092267 -0.01539,0.1764801 0.1875,0.34375 0.01899,0.015735 0.04457,0.014317 0.0625,0.03125 0.124258,0.1010283 5.71875,4.65625 5.71875,4.65625 0.373658,0.304091 0.504393,0.795817 0.34375,1.25 -0.160635,0.454191 -0.580748,0.373449 -1.0625,0.375 -5.634142,0.05114 -17.625,0.03125 -17.625,0.03125 -0.952967,6.38e-4 -2.3399576,0.524782 -2.40625,1.59375 -0.063562,1.024947 0.924797,1.4375 1.59375,1.4375 0,-1e-6 8.8125,0 8.8125,0 0.488364,-5.92e-4 0.936141,0.225277 1.09375,0.6875 0.157609,0.462231 -0.01926,0.514621 -0.40625,0.8125 0,0 -15.875,12.21875 -15.875,12.21875 -0.00142,0.0014 -0.029829,-0.0014 -0.03125,0 -0.064037,0.04879 -0.054226,0.04875 -0.03125,0.03125 -0.5536758,0.424619 -0.9087886,1.004019 -1.03125,1.5 -0.1224536,0.495981 -0.04661,0.856152 0.1875,1.15625 0.4788333,0.613413 1.777612,0.754857 2.90625,-0.15625 1e-7,10e-7 8.65625,-7.09375 8.65625,-7.09375 0.361955,-0.295753 0.872897,-0.352437 1.28125,-0.125 0.408345,0.227436 0.623381,0.692814 0.5625,1.15625 0,-1e-6 -0.0997,0.953636 -0.09375,1.34375 0.09498,1.301756 0.451616,2.521825 0.989039,3.664234 C 20.799917,36.321089 27.770982,19.392853 44.1875,21.03125 43.339652,19.54368 42.151282,18.185293 40.65625,16.96875 36.159865,13.309932 31.42016,9.8828973 26.8125,6.34375 26.805335,6.3388584 26.788292,6.317553 26.78125,6.3125 26.570707,6.1513121 26.216591,6.0306895 25.8125,6.03125 z"
style="opacity:0.51999996;fill:url(#radialGradient39177);fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 977 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 845 B

View File

@@ -1,250 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg7854"
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
version="1.0"
sodipodi:docname="blender.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:modified="true"
inkscape:export-filename="/home/user/my/blender/builds/blender/release/freedesktop/icons/16x16/blender.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs7856">
<linearGradient
inkscape:collect="always"
id="linearGradient39171">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39173" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop39175" />
</linearGradient>
<linearGradient
id="linearGradient39155">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39157" />
<stop
style="stop-color:#dadada;stop-opacity:1;"
offset="1"
id="stop39159" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35500">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop35502" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop35504" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35488">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop35490" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop35492" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3564">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3566" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop3568" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3564"
id="linearGradient34576"
gradientUnits="userSpaceOnUse"
x1="185.9903"
y1="193.33229"
x2="190.46461"
y2="-458.05771"
gradientTransform="matrix(0.06818845,0,0,0.06818845,22.51112,27.02885)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient35488"
id="radialGradient35494"
cx="28.019106"
cy="38.98439"
fx="28.019106"
fy="38.98439"
r="15.467961"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient35500"
id="linearGradient35506"
x1="21.204315"
y1="21.699249"
x2="20.155914"
y2="-26.908371"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient39155"
id="linearGradient39161"
x1="31.1875"
y1="18.875"
x2="29.875"
y2="34.375"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient39171"
id="radialGradient39177"
cx="26.109201"
cy="19.668886"
fx="26.109201"
fy="19.668886"
r="20.278975"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#e0e0e0"
borderopacity="1"
gridtolerance="10000"
guidetolerance="10"
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="16.245778"
inkscape:cx="10.326105"
inkscape:cy="15.440713"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="48px"
height="48px"
inkscape:showpageshadow="false"
inkscape:window-width="1392"
inkscape:window-height="976"
inkscape:window-x="0"
inkscape:window-y="0"
showgrid="false"
inkscape:window-maximized="1" />
<metadata
id="metadata7859">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:title></dc:title>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
<cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-32)">
<g
id="blender"
transform="matrix(0.32150786,0,0,0.32150786,0.0378132,31.723202)"
inkscape:label="blender">
<path
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
sodipodi:ry="5.3033009"
sodipodi:rx="15.467961"
sodipodi:cy="38.98439"
sodipodi:cx="28.019106"
id="path35486"
style="opacity:0.54857142;color:#000000;fill:url(#radialGradient35494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csssssssssscccsscccscccssccc"
d="m 16.048489,28.093447 c 0.0098,0.576682 0.196474,1.697902 0.471116,2.577425 0.581566,1.854137 1.56684,3.572658 2.939126,5.086496 1.407488,1.553118 3.138519,2.803227 5.139315,3.68976 2.105357,0.931573 4.384795,1.407488 6.750134,1.403741 2.365339,-0.005 4.644601,-0.488686 6.74896,-1.427017 2.00002,-0.895288 3.731043,-2.148391 5.13754,-3.705517 1.369207,-1.519844 2.352576,-3.241114 2.934089,-5.096258 0.294262,-0.938353 0.476921,-1.889392 0.553238,-2.845308 0.07331,-0.939306 0.04204,-1.883511 -0.09183,-2.823792 -0.259981,-1.835599 -0.896294,-3.556847 -1.872652,-5.12758 -0.895541,-1.441699 -2.047808,-2.70454 -3.417268,-3.766975 0,0 0.002,-0.002 0.002,-0.002 0,0 -13.828458,-10.6197195 -13.828458,-10.6197195 -0.01176,-0.00978 -0.02252,-0.019551 -0.03529,-0.028344 -0.909003,-0.6959264 -2.434775,-0.6939758 -3.431728,0.00488 -1.01067,0.7057021 -1.091821,1.8092613 -0.195527,2.5482146 1.899775,1.4997633 3.792068,3.0680399 5.702368,4.5676189 0,0 -17.551681,-0.01171 -17.551681,-0.01171 -1.994685,0 -3.1682604,0.947915 -3.4153942,2.333683 -0.2180771,1.222836 0.7479213,2.738129 2.4800212,2.738129 2.956573,0.0039 5.942111,-0.0069 8.909215,-0.01272 0,0 -15.901723,11.764162 -15.901723,11.764162 -0.020527,0.01564 -0.041053,0.02933 -0.06158,0.04497 -1.4974197,1.148389 -1.9831951,3.059322 -1.0399808,4.268393 0.9598323,1.22959 2.9977653,1.230588 4.5147288,0.006 0,0 8.677593,-7.102098 8.677593,-7.102098 0,0 -0.12511,0.959824 -0.116333,1.535532 z"
id="path2482"
style="fill:#f57900;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
transform="matrix(0.821621,0,0,0.839506,5.875686,3.882724)"
d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
sodipodi:ry="10.125"
sodipodi:rx="11.5625"
sodipodi:cy="25.75"
sodipodi:cx="31.1875"
id="path39153"
style="color:#000000;fill:url(#linearGradient39161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cssssscscczccsccssssccscccccscssc"
id="path3562"
d="m 25.796988,6.0267804 c -0.404852,5.53e-4 -0.818619,0.1256944 -1.095272,0.3196267 -7.14e-4,7.142e-4 -0.0014,0.00143 -0.0021,0.00213 -0.280209,0.1956525 -0.336859,0.3680061 -0.345206,0.4602725 -0.0083,0.092266 -0.01324,0.1672776 0.189655,0.3345475 0.01899,0.015735 0.03747,0.032076 0.0554,0.049009 0.124258,0.1010285 5.704394,4.6389489 5.704394,4.6389489 0.373658,0.304091 0.51584,0.810232 0.355197,1.264415 -0.160635,0.454191 -0.589422,0.382732 -1.071174,0.384283 -5.634142,0.05114 -17.60967,0.01918 -17.60967,0.01918 -0.952967,6.38e-4 -2.3472795,0.516793 -2.4135719,1.585761 -0.063562,1.024947 0.9093059,1.457499 1.5782589,1.457499 0,0 8.830403,-0.01705 8.830403,-0.01705 0.488364,-5.91e-4 0.922857,0.221532 1.080466,0.683755 0.15761,0.462231 0.0033,0.53156 -0.383664,0.829439 0,0 -15.9006939,12.205735 -15.9006939,12.205735 -0.00142,0.0014 -0.00284,0.0028 -0.00426,0.0043 -0.064038,0.04879 -0.084772,0.06226 -0.061795,0.04476 -0.5536756,0.424618 -0.8961097,0.98072 -1.0185711,1.476701 -0.1224537,0.495981 -0.04659,0.882548 0.1875202,1.182646 0.4788333,0.613413 1.7693735,0.732111 2.8980115,-0.178996 0,0 8.6727243,-7.09799 8.6727243,-7.09799 0.361955,-0.295752 0.867758,-0.340606 1.276111,-0.113169 0.408345,0.227437 0.636512,0.681082 0.575631,1.144518 0,0 -0.112502,0.980045 -0.10655,1.370159 0.192357,2.636407 1.448328,4.914995 3.115366,6.91474 2.877746,3.172809 6.84939,4.556285 11.042271,4.719919 4.20342,-0.04394 8.185784,-1.662428 11.042264,-4.758277 5.218918,-6.385867 3.941737,-13.3639 -1.747326,-17.993227 C 36.14442,13.301598 31.42752,9.8792062 26.81986,6.3400589 c -0.0043,-0.00352 -0.0086,-0.00707 -0.01279,-0.010651 -0.0072,-0.00489 -0.01427,-0.00987 -0.02131,-0.014921 -0.210578,-0.1612288 -0.584681,-0.288267 -0.988772,-0.2877065 z"
style="opacity:0.4857143;fill:none;stroke:url(#linearGradient34576);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m 26.007076,24.754048 c 0.07447,-1.361157 0.739293,-2.562655 1.738705,-3.413271 0.983518,-0.836183 2.304215,-1.346747 3.746876,-1.346747 1.441743,0 2.762441,0.510564 3.745729,1.346747 1.000515,0.850616 1.664539,2.051213 1.739875,3.41237 0.07718,1.400852 -0.4828,2.701576 -1.46425,3.66495 -1.000516,0.981409 -2.427099,1.597503 -4.021354,1.597503 -1.595172,0 -3.021756,-0.616094 -4.022225,-1.597503 -0.982461,-0.963374 -1.540507,-2.264098 -1.463356,-3.664049 z"
id="path2478"
style="fill:#3465a4;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="csssscsccsscsccssssscsscccsssc"
id="path39166"
d="m 25.8125,6.03125 c -0.404852,5.528e-4 -0.848347,0.1185677 -1.125,0.3125 -0.280209,0.1956523 -0.335403,0.3764836 -0.34375,0.46875 -0.0083,0.092267 -0.01539,0.1764801 0.1875,0.34375 0.01899,0.015735 0.04457,0.014317 0.0625,0.03125 0.124258,0.1010283 5.71875,4.65625 5.71875,4.65625 0.373658,0.304091 0.504393,0.795817 0.34375,1.25 -0.160635,0.454191 -0.580748,0.373449 -1.0625,0.375 -5.634142,0.05114 -17.625,0.03125 -17.625,0.03125 -0.952967,6.38e-4 -2.3399576,0.524782 -2.40625,1.59375 -0.063562,1.024947 0.924797,1.4375 1.59375,1.4375 0,-1e-6 8.8125,0 8.8125,0 0.488364,-5.92e-4 0.936141,0.225277 1.09375,0.6875 0.157609,0.462231 -0.01926,0.514621 -0.40625,0.8125 0,0 -15.875,12.21875 -15.875,12.21875 -0.00142,0.0014 -0.029829,-0.0014 -0.03125,0 -0.064037,0.04879 -0.054226,0.04875 -0.03125,0.03125 -0.5536758,0.424619 -0.9087886,1.004019 -1.03125,1.5 -0.1224536,0.495981 -0.04661,0.856152 0.1875,1.15625 0.4788333,0.613413 1.777612,0.754857 2.90625,-0.15625 1e-7,10e-7 8.65625,-7.09375 8.65625,-7.09375 0.361955,-0.295753 0.872897,-0.352437 1.28125,-0.125 0.408345,0.227436 0.623381,0.692814 0.5625,1.15625 0,-1e-6 -0.0997,0.953636 -0.09375,1.34375 0.09498,1.301756 0.451616,2.521825 0.989039,3.664234 C 20.799917,36.321089 27.770982,19.392853 44.1875,21.03125 43.339652,19.54368 42.151282,18.185293 40.65625,16.96875 36.159865,13.309932 31.42016,9.8828973 26.8125,6.34375 26.805335,6.3388584 26.788292,6.317553 26.78125,6.3125 26.570707,6.1513121 26.216591,6.0306895 25.8125,6.03125 z"
style="opacity:0.51999996;fill:url(#radialGradient39177);fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

View File

@@ -1,249 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="192"
height="192"
id="svg7854"
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
version="1.0"
sodipodi:docname="blender.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:modified="true"
inkscape:export-filename="/home/user/my/blender/builds/blender/release/freedesktop/icons/192x192/blender.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs7856">
<linearGradient
inkscape:collect="always"
id="linearGradient39171">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39173" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop39175" />
</linearGradient>
<linearGradient
id="linearGradient39155">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39157" />
<stop
style="stop-color:#dadada;stop-opacity:1;"
offset="1"
id="stop39159" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35500">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop35502" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop35504" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35488">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop35490" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop35492" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3564">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3566" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop3568" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3564"
id="linearGradient34576"
gradientUnits="userSpaceOnUse"
x1="185.9903"
y1="193.33229"
x2="190.46461"
y2="-458.05771"
gradientTransform="matrix(0.06818845,0,0,0.06818845,22.51112,27.02885)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient35488"
id="radialGradient35494"
cx="28.019106"
cy="38.98439"
fx="28.019106"
fy="38.98439"
r="15.467961"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient35500"
id="linearGradient35506"
x1="21.204315"
y1="21.699249"
x2="20.155914"
y2="-26.908371"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient39155"
id="linearGradient39161"
x1="31.1875"
y1="18.875"
x2="29.875"
y2="34.375"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient39171"
id="radialGradient39177"
cx="26.109201"
cy="19.668886"
fx="26.109201"
fy="19.668886"
r="20.278975"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#e0e0e0"
borderopacity="1"
gridtolerance="10000"
guidetolerance="10"
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.871875"
inkscape:cx="80.218452"
inkscape:cy="77.31968"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="48px"
height="48px"
inkscape:showpageshadow="false"
inkscape:window-width="1046"
inkscape:window-height="975"
inkscape:window-x="345"
inkscape:window-y="0"
showgrid="false"
inkscape:window-maximized="0" />
<metadata
id="metadata7859">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:title></dc:title>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
<cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,144)">
<g
id="g3199"
transform="matrix(4.0212554,0,0,4.0212554,-4.1251212,-146.26254)">
<path
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
sodipodi:ry="5.3033009"
sodipodi:rx="15.467961"
sodipodi:cy="38.98439"
sodipodi:cx="28.019106"
id="path35486"
style="opacity:0.54857142;color:#000000;fill:url(#radialGradient35494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csssssssssscccsscccscccssccc"
d="m 16.048489,28.093447 c 0.0098,0.576682 0.196474,1.697902 0.471116,2.577425 0.581566,1.854137 1.56684,3.572658 2.939126,5.086496 1.407488,1.553118 3.138519,2.803227 5.139315,3.68976 2.105357,0.931573 4.384795,1.407488 6.750134,1.403741 2.365339,-0.005 4.644601,-0.488686 6.74896,-1.427017 2.00002,-0.895288 3.731043,-2.148391 5.13754,-3.705517 1.369207,-1.519844 2.352576,-3.241114 2.934089,-5.096258 0.294262,-0.938353 0.476921,-1.889392 0.553238,-2.845308 0.07331,-0.939306 0.04204,-1.883511 -0.09183,-2.823792 -0.259981,-1.835599 -0.896294,-3.556847 -1.872652,-5.12758 -0.895541,-1.441699 -2.047808,-2.70454 -3.417268,-3.766975 0,0 0.002,-0.002 0.002,-0.002 0,0 -13.828458,-10.6197195 -13.828458,-10.6197195 -0.01176,-0.00978 -0.02252,-0.019551 -0.03529,-0.028344 -0.909003,-0.6959264 -2.434775,-0.6939758 -3.431728,0.00488 -1.01067,0.7057021 -1.091821,1.8092613 -0.195527,2.5482146 1.899775,1.4997633 3.792068,3.0680399 5.702368,4.5676189 0,0 -17.551681,-0.01171 -17.551681,-0.01171 -1.994685,0 -3.1682604,0.947915 -3.4153942,2.333683 -0.2180771,1.222836 0.7479213,2.738129 2.4800212,2.738129 2.956573,0.0039 5.942111,-0.0069 8.909215,-0.01272 0,0 -15.901723,11.764162 -15.901723,11.764162 -0.020527,0.01564 -0.041053,0.02933 -0.06158,0.04497 -1.4974197,1.148389 -1.9831951,3.059322 -1.0399808,4.268393 0.9598323,1.22959 2.9977653,1.230588 4.5147288,0.006 0,0 8.677593,-7.102098 8.677593,-7.102098 0,0 -0.12511,0.959824 -0.116333,1.535532 z"
id="path2482"
style="fill:#f57900;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
transform="matrix(0.821621,0,0,0.839506,5.875686,3.882724)"
d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
sodipodi:ry="10.125"
sodipodi:rx="11.5625"
sodipodi:cy="25.75"
sodipodi:cx="31.1875"
id="path39153"
style="color:#000000;fill:url(#linearGradient39161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cssssscscczccsccssssccscccccscssc"
id="path3562"
d="m 25.796988,6.0267804 c -0.404852,5.53e-4 -0.818619,0.1256944 -1.095272,0.3196267 -7.14e-4,7.142e-4 -0.0014,0.00143 -0.0021,0.00213 -0.280209,0.1956525 -0.336859,0.3680061 -0.345206,0.4602725 -0.0083,0.092266 -0.01324,0.1672776 0.189655,0.3345475 0.01899,0.015735 0.03747,0.032076 0.0554,0.049009 0.124258,0.1010285 5.704394,4.6389489 5.704394,4.6389489 0.373658,0.304091 0.51584,0.810232 0.355197,1.264415 -0.160635,0.454191 -0.589422,0.382732 -1.071174,0.384283 -5.634142,0.05114 -17.60967,0.01918 -17.60967,0.01918 -0.952967,6.38e-4 -2.3472795,0.516793 -2.4135719,1.585761 -0.063562,1.024947 0.9093059,1.457499 1.5782589,1.457499 0,0 8.830403,-0.01705 8.830403,-0.01705 0.488364,-5.91e-4 0.922857,0.221532 1.080466,0.683755 0.15761,0.462231 0.0033,0.53156 -0.383664,0.829439 0,0 -15.9006939,12.205735 -15.9006939,12.205735 -0.00142,0.0014 -0.00284,0.0028 -0.00426,0.0043 -0.064038,0.04879 -0.084772,0.06226 -0.061795,0.04476 -0.5536756,0.424618 -0.8961097,0.98072 -1.0185711,1.476701 -0.1224537,0.495981 -0.04659,0.882548 0.1875202,1.182646 0.4788333,0.613413 1.7693735,0.732111 2.8980115,-0.178996 0,0 8.6727243,-7.09799 8.6727243,-7.09799 0.361955,-0.295752 0.867758,-0.340606 1.276111,-0.113169 0.408345,0.227437 0.636512,0.681082 0.575631,1.144518 0,0 -0.112502,0.980045 -0.10655,1.370159 0.192357,2.636407 1.448328,4.914995 3.115366,6.91474 2.877746,3.172809 6.84939,4.556285 11.042271,4.719919 4.20342,-0.04394 8.185784,-1.662428 11.042264,-4.758277 5.218918,-6.385867 3.941737,-13.3639 -1.747326,-17.993227 C 36.14442,13.301598 31.42752,9.8792062 26.81986,6.3400589 c -0.0043,-0.00352 -0.0086,-0.00707 -0.01279,-0.010651 -0.0072,-0.00489 -0.01427,-0.00987 -0.02131,-0.014921 -0.210578,-0.1612288 -0.584681,-0.288267 -0.988772,-0.2877065 z"
style="opacity:0.4857143;fill:none;stroke:url(#linearGradient34576);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m 26.007076,24.754048 c 0.07447,-1.361157 0.739293,-2.562655 1.738705,-3.413271 0.983518,-0.836183 2.304215,-1.346747 3.746876,-1.346747 1.441743,0 2.762441,0.510564 3.745729,1.346747 1.000515,0.850616 1.664539,2.051213 1.739875,3.41237 0.07718,1.400852 -0.4828,2.701576 -1.46425,3.66495 -1.000516,0.981409 -2.427099,1.597503 -4.021354,1.597503 -1.595172,0 -3.021756,-0.616094 -4.022225,-1.597503 -0.982461,-0.963374 -1.540507,-2.264098 -1.463356,-3.664049 z"
id="path2478"
style="fill:#3465a4;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="csssscsccsscsccssssscsscccsssc"
id="path39166"
d="m 25.8125,6.03125 c -0.404852,5.528e-4 -0.848347,0.1185677 -1.125,0.3125 -0.280209,0.1956523 -0.335403,0.3764836 -0.34375,0.46875 -0.0083,0.092267 -0.01539,0.1764801 0.1875,0.34375 0.01899,0.015735 0.04457,0.014317 0.0625,0.03125 0.124258,0.1010283 5.71875,4.65625 5.71875,4.65625 0.373658,0.304091 0.504393,0.795817 0.34375,1.25 -0.160635,0.454191 -0.580748,0.373449 -1.0625,0.375 -5.634142,0.05114 -17.625,0.03125 -17.625,0.03125 -0.952967,6.38e-4 -2.3399576,0.524782 -2.40625,1.59375 -0.063562,1.024947 0.924797,1.4375 1.59375,1.4375 0,-1e-6 8.8125,0 8.8125,0 0.488364,-5.92e-4 0.936141,0.225277 1.09375,0.6875 0.157609,0.462231 -0.01926,0.514621 -0.40625,0.8125 0,0 -15.875,12.21875 -15.875,12.21875 -0.00142,0.0014 -0.029829,-0.0014 -0.03125,0 -0.064037,0.04879 -0.054226,0.04875 -0.03125,0.03125 -0.5536758,0.424619 -0.9087886,1.004019 -1.03125,1.5 -0.1224536,0.495981 -0.04661,0.856152 0.1875,1.15625 0.4788333,0.613413 1.777612,0.754857 2.90625,-0.15625 1e-7,10e-7 8.65625,-7.09375 8.65625,-7.09375 0.361955,-0.295753 0.872897,-0.352437 1.28125,-0.125 0.408345,0.227436 0.623381,0.692814 0.5625,1.15625 0,-1e-6 -0.0997,0.953636 -0.09375,1.34375 0.09498,1.301756 0.451616,2.521825 0.989039,3.664234 C 20.799917,36.321089 27.770982,19.392853 44.1875,21.03125 43.339652,19.54368 42.151282,18.185293 40.65625,16.96875 36.159865,13.309932 31.42016,9.8828973 26.8125,6.34375 26.805335,6.3388584 26.788292,6.317553 26.78125,6.3125 26.570707,6.1513121 26.216591,6.0306895 25.8125,6.03125 z"
style="opacity:0.51999996;fill:url(#radialGradient39177);fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -1,250 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="22"
height="22"
id="svg7854"
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
version="1.0"
sodipodi:docname="blender.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:modified="true"
inkscape:export-filename="/home/user/my/blender/builds/blender/release/freedesktop/icons/22x22/blender.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs7856">
<linearGradient
inkscape:collect="always"
id="linearGradient39171">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39173" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop39175" />
</linearGradient>
<linearGradient
id="linearGradient39155">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39157" />
<stop
style="stop-color:#dadada;stop-opacity:1;"
offset="1"
id="stop39159" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35500">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop35502" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop35504" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35488">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop35490" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop35492" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3564">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3566" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop3568" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3564"
id="linearGradient34576"
gradientUnits="userSpaceOnUse"
x1="185.9903"
y1="193.33229"
x2="190.46461"
y2="-458.05771"
gradientTransform="matrix(0.06818845,0,0,0.06818845,22.51112,27.02885)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient35488"
id="radialGradient35494"
cx="28.019106"
cy="38.98439"
fx="28.019106"
fy="38.98439"
r="15.467961"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient35500"
id="linearGradient35506"
x1="21.204315"
y1="21.699249"
x2="20.155914"
y2="-26.908371"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient39155"
id="linearGradient39161"
x1="31.1875"
y1="18.875"
x2="29.875"
y2="34.375"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient39171"
id="radialGradient39177"
cx="26.109201"
cy="19.668886"
fx="26.109201"
fy="19.668886"
r="20.278975"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#e0e0e0"
borderopacity="1"
gridtolerance="10000"
guidetolerance="10"
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="16.245778"
inkscape:cx="10.326105"
inkscape:cy="15.440713"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="48px"
height="48px"
inkscape:showpageshadow="false"
inkscape:window-width="1392"
inkscape:window-height="976"
inkscape:window-x="0"
inkscape:window-y="0"
showgrid="false"
inkscape:window-maximized="1" />
<metadata
id="metadata7859">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:title></dc:title>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
<cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-26)">
<g
id="blender"
transform="matrix(0.45418175,0,0,0.45418175,-0.2261234,25.847379)"
inkscape:label="blender">
<path
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
sodipodi:ry="5.3033009"
sodipodi:rx="15.467961"
sodipodi:cy="38.98439"
sodipodi:cx="28.019106"
id="path35486"
style="opacity:0.54857142;color:#000000;fill:url(#radialGradient35494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csssssssssscccsscccscccssccc"
d="m 16.048489,28.093447 c 0.0098,0.576682 0.196474,1.697902 0.471116,2.577425 0.581566,1.854137 1.56684,3.572658 2.939126,5.086496 1.407488,1.553118 3.138519,2.803227 5.139315,3.68976 2.105357,0.931573 4.384795,1.407488 6.750134,1.403741 2.365339,-0.005 4.644601,-0.488686 6.74896,-1.427017 2.00002,-0.895288 3.731043,-2.148391 5.13754,-3.705517 1.369207,-1.519844 2.352576,-3.241114 2.934089,-5.096258 0.294262,-0.938353 0.476921,-1.889392 0.553238,-2.845308 0.07331,-0.939306 0.04204,-1.883511 -0.09183,-2.823792 -0.259981,-1.835599 -0.896294,-3.556847 -1.872652,-5.12758 -0.895541,-1.441699 -2.047808,-2.70454 -3.417268,-3.766975 0,0 0.002,-0.002 0.002,-0.002 0,0 -13.828458,-10.6197195 -13.828458,-10.6197195 -0.01176,-0.00978 -0.02252,-0.019551 -0.03529,-0.028344 -0.909003,-0.6959264 -2.434775,-0.6939758 -3.431728,0.00488 -1.01067,0.7057021 -1.091821,1.8092613 -0.195527,2.5482146 1.899775,1.4997633 3.792068,3.0680399 5.702368,4.5676189 0,0 -17.551681,-0.01171 -17.551681,-0.01171 -1.994685,0 -3.1682604,0.947915 -3.4153942,2.333683 -0.2180771,1.222836 0.7479213,2.738129 2.4800212,2.738129 2.956573,0.0039 5.942111,-0.0069 8.909215,-0.01272 0,0 -15.901723,11.764162 -15.901723,11.764162 -0.020527,0.01564 -0.041053,0.02933 -0.06158,0.04497 -1.4974197,1.148389 -1.9831951,3.059322 -1.0399808,4.268393 0.9598323,1.22959 2.9977653,1.230588 4.5147288,0.006 0,0 8.677593,-7.102098 8.677593,-7.102098 0,0 -0.12511,0.959824 -0.116333,1.535532 z"
id="path2482"
style="fill:#f57900;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
transform="matrix(0.821621,0,0,0.839506,5.875686,3.882724)"
d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
sodipodi:ry="10.125"
sodipodi:rx="11.5625"
sodipodi:cy="25.75"
sodipodi:cx="31.1875"
id="path39153"
style="color:#000000;fill:url(#linearGradient39161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cssssscscczccsccssssccscccccscssc"
id="path3562"
d="m 25.796988,6.0267804 c -0.404852,5.53e-4 -0.818619,0.1256944 -1.095272,0.3196267 -7.14e-4,7.142e-4 -0.0014,0.00143 -0.0021,0.00213 -0.280209,0.1956525 -0.336859,0.3680061 -0.345206,0.4602725 -0.0083,0.092266 -0.01324,0.1672776 0.189655,0.3345475 0.01899,0.015735 0.03747,0.032076 0.0554,0.049009 0.124258,0.1010285 5.704394,4.6389489 5.704394,4.6389489 0.373658,0.304091 0.51584,0.810232 0.355197,1.264415 -0.160635,0.454191 -0.589422,0.382732 -1.071174,0.384283 -5.634142,0.05114 -17.60967,0.01918 -17.60967,0.01918 -0.952967,6.38e-4 -2.3472795,0.516793 -2.4135719,1.585761 -0.063562,1.024947 0.9093059,1.457499 1.5782589,1.457499 0,0 8.830403,-0.01705 8.830403,-0.01705 0.488364,-5.91e-4 0.922857,0.221532 1.080466,0.683755 0.15761,0.462231 0.0033,0.53156 -0.383664,0.829439 0,0 -15.9006939,12.205735 -15.9006939,12.205735 -0.00142,0.0014 -0.00284,0.0028 -0.00426,0.0043 -0.064038,0.04879 -0.084772,0.06226 -0.061795,0.04476 -0.5536756,0.424618 -0.8961097,0.98072 -1.0185711,1.476701 -0.1224537,0.495981 -0.04659,0.882548 0.1875202,1.182646 0.4788333,0.613413 1.7693735,0.732111 2.8980115,-0.178996 0,0 8.6727243,-7.09799 8.6727243,-7.09799 0.361955,-0.295752 0.867758,-0.340606 1.276111,-0.113169 0.408345,0.227437 0.636512,0.681082 0.575631,1.144518 0,0 -0.112502,0.980045 -0.10655,1.370159 0.192357,2.636407 1.448328,4.914995 3.115366,6.91474 2.877746,3.172809 6.84939,4.556285 11.042271,4.719919 4.20342,-0.04394 8.185784,-1.662428 11.042264,-4.758277 5.218918,-6.385867 3.941737,-13.3639 -1.747326,-17.993227 C 36.14442,13.301598 31.42752,9.8792062 26.81986,6.3400589 c -0.0043,-0.00352 -0.0086,-0.00707 -0.01279,-0.010651 -0.0072,-0.00489 -0.01427,-0.00987 -0.02131,-0.014921 -0.210578,-0.1612288 -0.584681,-0.288267 -0.988772,-0.2877065 z"
style="opacity:0.4857143;fill:none;stroke:url(#linearGradient34576);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m 26.007076,24.754048 c 0.07447,-1.361157 0.739293,-2.562655 1.738705,-3.413271 0.983518,-0.836183 2.304215,-1.346747 3.746876,-1.346747 1.441743,0 2.762441,0.510564 3.745729,1.346747 1.000515,0.850616 1.664539,2.051213 1.739875,3.41237 0.07718,1.400852 -0.4828,2.701576 -1.46425,3.66495 -1.000516,0.981409 -2.427099,1.597503 -4.021354,1.597503 -1.595172,0 -3.021756,-0.616094 -4.022225,-1.597503 -0.982461,-0.963374 -1.540507,-2.264098 -1.463356,-3.664049 z"
id="path2478"
style="fill:#3465a4;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="csssscsccsscsccssssscsscccsssc"
id="path39166"
d="m 25.8125,6.03125 c -0.404852,5.528e-4 -0.848347,0.1185677 -1.125,0.3125 -0.280209,0.1956523 -0.335403,0.3764836 -0.34375,0.46875 -0.0083,0.092267 -0.01539,0.1764801 0.1875,0.34375 0.01899,0.015735 0.04457,0.014317 0.0625,0.03125 0.124258,0.1010283 5.71875,4.65625 5.71875,4.65625 0.373658,0.304091 0.504393,0.795817 0.34375,1.25 -0.160635,0.454191 -0.580748,0.373449 -1.0625,0.375 -5.634142,0.05114 -17.625,0.03125 -17.625,0.03125 -0.952967,6.38e-4 -2.3399576,0.524782 -2.40625,1.59375 -0.063562,1.024947 0.924797,1.4375 1.59375,1.4375 0,-1e-6 8.8125,0 8.8125,0 0.488364,-5.92e-4 0.936141,0.225277 1.09375,0.6875 0.157609,0.462231 -0.01926,0.514621 -0.40625,0.8125 0,0 -15.875,12.21875 -15.875,12.21875 -0.00142,0.0014 -0.029829,-0.0014 -0.03125,0 -0.064037,0.04879 -0.054226,0.04875 -0.03125,0.03125 -0.5536758,0.424619 -0.9087886,1.004019 -1.03125,1.5 -0.1224536,0.495981 -0.04661,0.856152 0.1875,1.15625 0.4788333,0.613413 1.777612,0.754857 2.90625,-0.15625 1e-7,10e-7 8.65625,-7.09375 8.65625,-7.09375 0.361955,-0.295753 0.872897,-0.352437 1.28125,-0.125 0.408345,0.227436 0.623381,0.692814 0.5625,1.15625 0,-1e-6 -0.0997,0.953636 -0.09375,1.34375 0.09498,1.301756 0.451616,2.521825 0.989039,3.664234 C 20.799917,36.321089 27.770982,19.392853 44.1875,21.03125 43.339652,19.54368 42.151282,18.185293 40.65625,16.96875 36.159865,13.309932 31.42016,9.8828973 26.8125,6.34375 26.805335,6.3388584 26.788292,6.317553 26.78125,6.3125 26.570707,6.1513121 26.216591,6.0306895 25.8125,6.03125 z"
style="opacity:0.51999996;fill:url(#radialGradient39177);fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -1,250 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="32"
height="32"
id="svg7854"
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
version="1.0"
sodipodi:docname="blender.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:modified="true"
inkscape:export-filename="/home/user/my/blender/builds/blender/release/freedesktop/icons/32x32/blender.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs7856">
<linearGradient
inkscape:collect="always"
id="linearGradient39171">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39173" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop39175" />
</linearGradient>
<linearGradient
id="linearGradient39155">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39157" />
<stop
style="stop-color:#dadada;stop-opacity:1;"
offset="1"
id="stop39159" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35500">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop35502" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop35504" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35488">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop35490" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop35492" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3564">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3566" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop3568" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3564"
id="linearGradient34576"
gradientUnits="userSpaceOnUse"
x1="185.9903"
y1="193.33229"
x2="190.46461"
y2="-458.05771"
gradientTransform="matrix(0.06818845,0,0,0.06818845,22.51112,27.02885)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient35488"
id="radialGradient35494"
cx="28.019106"
cy="38.98439"
fx="28.019106"
fy="38.98439"
r="15.467961"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient35500"
id="linearGradient35506"
x1="21.204315"
y1="21.699249"
x2="20.155914"
y2="-26.908371"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient39155"
id="linearGradient39161"
x1="31.1875"
y1="18.875"
x2="29.875"
y2="34.375"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient39171"
id="radialGradient39177"
cx="26.109201"
cy="19.668886"
fx="26.109201"
fy="19.668886"
r="20.278975"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#e0e0e0"
borderopacity="1"
gridtolerance="10000"
guidetolerance="10"
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="8.1228891"
inkscape:cx="39.360762"
inkscape:cy="28.503541"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="48px"
height="48px"
inkscape:showpageshadow="false"
inkscape:window-width="1392"
inkscape:window-height="976"
inkscape:window-x="0"
inkscape:window-y="0"
showgrid="false"
inkscape:window-maximized="1" />
<metadata
id="metadata7859">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:title></dc:title>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
<cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-16)">
<g
id="blender"
transform="matrix(0.65782075,0,0,0.65782075,-0.38501735,15.782256)"
inkscape:label="blender">
<path
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
sodipodi:ry="5.3033009"
sodipodi:rx="15.467961"
sodipodi:cy="38.98439"
sodipodi:cx="28.019106"
id="path35486"
style="opacity:0.54857142;color:#000000;fill:url(#radialGradient35494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csssssssssscccsscccscccssccc"
d="m 16.048489,28.093447 c 0.0098,0.576682 0.196474,1.697902 0.471116,2.577425 0.581566,1.854137 1.56684,3.572658 2.939126,5.086496 1.407488,1.553118 3.138519,2.803227 5.139315,3.68976 2.105357,0.931573 4.384795,1.407488 6.750134,1.403741 2.365339,-0.005 4.644601,-0.488686 6.74896,-1.427017 2.00002,-0.895288 3.731043,-2.148391 5.13754,-3.705517 1.369207,-1.519844 2.352576,-3.241114 2.934089,-5.096258 0.294262,-0.938353 0.476921,-1.889392 0.553238,-2.845308 0.07331,-0.939306 0.04204,-1.883511 -0.09183,-2.823792 -0.259981,-1.835599 -0.896294,-3.556847 -1.872652,-5.12758 -0.895541,-1.441699 -2.047808,-2.70454 -3.417268,-3.766975 0,0 0.002,-0.002 0.002,-0.002 0,0 -13.828458,-10.6197195 -13.828458,-10.6197195 -0.01176,-0.00978 -0.02252,-0.019551 -0.03529,-0.028344 -0.909003,-0.6959264 -2.434775,-0.6939758 -3.431728,0.00488 -1.01067,0.7057021 -1.091821,1.8092613 -0.195527,2.5482146 1.899775,1.4997633 3.792068,3.0680399 5.702368,4.5676189 0,0 -17.551681,-0.01171 -17.551681,-0.01171 -1.994685,0 -3.1682604,0.947915 -3.4153942,2.333683 -0.2180771,1.222836 0.7479213,2.738129 2.4800212,2.738129 2.956573,0.0039 5.942111,-0.0069 8.909215,-0.01272 0,0 -15.901723,11.764162 -15.901723,11.764162 -0.020527,0.01564 -0.041053,0.02933 -0.06158,0.04497 -1.4974197,1.148389 -1.9831951,3.059322 -1.0399808,4.268393 0.9598323,1.22959 2.9977653,1.230588 4.5147288,0.006 0,0 8.677593,-7.102098 8.677593,-7.102098 0,0 -0.12511,0.959824 -0.116333,1.535532 z"
id="path2482"
style="fill:#f57900;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
transform="matrix(0.821621,0,0,0.839506,5.875686,3.882724)"
d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
sodipodi:ry="10.125"
sodipodi:rx="11.5625"
sodipodi:cy="25.75"
sodipodi:cx="31.1875"
id="path39153"
style="color:#000000;fill:url(#linearGradient39161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cssssscscczccsccssssccscccccscssc"
id="path3562"
d="m 25.796988,6.0267804 c -0.404852,5.53e-4 -0.818619,0.1256944 -1.095272,0.3196267 -7.14e-4,7.142e-4 -0.0014,0.00143 -0.0021,0.00213 -0.280209,0.1956525 -0.336859,0.3680061 -0.345206,0.4602725 -0.0083,0.092266 -0.01324,0.1672776 0.189655,0.3345475 0.01899,0.015735 0.03747,0.032076 0.0554,0.049009 0.124258,0.1010285 5.704394,4.6389489 5.704394,4.6389489 0.373658,0.304091 0.51584,0.810232 0.355197,1.264415 -0.160635,0.454191 -0.589422,0.382732 -1.071174,0.384283 -5.634142,0.05114 -17.60967,0.01918 -17.60967,0.01918 -0.952967,6.38e-4 -2.3472795,0.516793 -2.4135719,1.585761 -0.063562,1.024947 0.9093059,1.457499 1.5782589,1.457499 0,0 8.830403,-0.01705 8.830403,-0.01705 0.488364,-5.91e-4 0.922857,0.221532 1.080466,0.683755 0.15761,0.462231 0.0033,0.53156 -0.383664,0.829439 0,0 -15.9006939,12.205735 -15.9006939,12.205735 -0.00142,0.0014 -0.00284,0.0028 -0.00426,0.0043 -0.064038,0.04879 -0.084772,0.06226 -0.061795,0.04476 -0.5536756,0.424618 -0.8961097,0.98072 -1.0185711,1.476701 -0.1224537,0.495981 -0.04659,0.882548 0.1875202,1.182646 0.4788333,0.613413 1.7693735,0.732111 2.8980115,-0.178996 0,0 8.6727243,-7.09799 8.6727243,-7.09799 0.361955,-0.295752 0.867758,-0.340606 1.276111,-0.113169 0.408345,0.227437 0.636512,0.681082 0.575631,1.144518 0,0 -0.112502,0.980045 -0.10655,1.370159 0.192357,2.636407 1.448328,4.914995 3.115366,6.91474 2.877746,3.172809 6.84939,4.556285 11.042271,4.719919 4.20342,-0.04394 8.185784,-1.662428 11.042264,-4.758277 5.218918,-6.385867 3.941737,-13.3639 -1.747326,-17.993227 C 36.14442,13.301598 31.42752,9.8792062 26.81986,6.3400589 c -0.0043,-0.00352 -0.0086,-0.00707 -0.01279,-0.010651 -0.0072,-0.00489 -0.01427,-0.00987 -0.02131,-0.014921 -0.210578,-0.1612288 -0.584681,-0.288267 -0.988772,-0.2877065 z"
style="opacity:0.4857143;fill:none;stroke:url(#linearGradient34576);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m 26.007076,24.754048 c 0.07447,-1.361157 0.739293,-2.562655 1.738705,-3.413271 0.983518,-0.836183 2.304215,-1.346747 3.746876,-1.346747 1.441743,0 2.762441,0.510564 3.745729,1.346747 1.000515,0.850616 1.664539,2.051213 1.739875,3.41237 0.07718,1.400852 -0.4828,2.701576 -1.46425,3.66495 -1.000516,0.981409 -2.427099,1.597503 -4.021354,1.597503 -1.595172,0 -3.021756,-0.616094 -4.022225,-1.597503 -0.982461,-0.963374 -1.540507,-2.264098 -1.463356,-3.664049 z"
id="path2478"
style="fill:#3465a4;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="csssscsccsscsccssssscsscccsssc"
id="path39166"
d="m 25.8125,6.03125 c -0.404852,5.528e-4 -0.848347,0.1185677 -1.125,0.3125 -0.280209,0.1956523 -0.335403,0.3764836 -0.34375,0.46875 -0.0083,0.092267 -0.01539,0.1764801 0.1875,0.34375 0.01899,0.015735 0.04457,0.014317 0.0625,0.03125 0.124258,0.1010283 5.71875,4.65625 5.71875,4.65625 0.373658,0.304091 0.504393,0.795817 0.34375,1.25 -0.160635,0.454191 -0.580748,0.373449 -1.0625,0.375 -5.634142,0.05114 -17.625,0.03125 -17.625,0.03125 -0.952967,6.38e-4 -2.3399576,0.524782 -2.40625,1.59375 -0.063562,1.024947 0.924797,1.4375 1.59375,1.4375 0,-1e-6 8.8125,0 8.8125,0 0.488364,-5.92e-4 0.936141,0.225277 1.09375,0.6875 0.157609,0.462231 -0.01926,0.514621 -0.40625,0.8125 0,0 -15.875,12.21875 -15.875,12.21875 -0.00142,0.0014 -0.029829,-0.0014 -0.03125,0 -0.064037,0.04879 -0.054226,0.04875 -0.03125,0.03125 -0.5536758,0.424619 -0.9087886,1.004019 -1.03125,1.5 -0.1224536,0.495981 -0.04661,0.856152 0.1875,1.15625 0.4788333,0.613413 1.777612,0.754857 2.90625,-0.15625 1e-7,10e-7 8.65625,-7.09375 8.65625,-7.09375 0.361955,-0.295753 0.872897,-0.352437 1.28125,-0.125 0.408345,0.227436 0.623381,0.692814 0.5625,1.15625 0,-1e-6 -0.0997,0.953636 -0.09375,1.34375 0.09498,1.301756 0.451616,2.521825 0.989039,3.664234 C 20.799917,36.321089 27.770982,19.392853 44.1875,21.03125 43.339652,19.54368 42.151282,18.185293 40.65625,16.96875 36.159865,13.309932 31.42016,9.8828973 26.8125,6.34375 26.805335,6.3388584 26.788292,6.317553 26.78125,6.3125 26.570707,6.1513121 26.216591,6.0306895 25.8125,6.03125 z"
style="opacity:0.51999996;fill:url(#radialGradient39177);fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

View File

@@ -1,240 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48"
height="48"
id="svg7854"
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
version="1.0"
sodipodi:docname="blender.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:modified="true">
<defs
id="defs7856">
<linearGradient
inkscape:collect="always"
id="linearGradient39171">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39173" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop39175" />
</linearGradient>
<linearGradient
id="linearGradient39155">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39157" />
<stop
style="stop-color:#dadada;stop-opacity:1;"
offset="1"
id="stop39159" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35500">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop35502" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop35504" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35488">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop35490" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop35492" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3564">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3566" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop3568" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3564"
id="linearGradient34576"
gradientUnits="userSpaceOnUse"
x1="185.9903"
y1="193.33229"
x2="190.46461"
y2="-458.05771"
gradientTransform="matrix(6.818845e-2,0,0,6.818845e-2,22.51112,27.02885)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient35488"
id="radialGradient35494"
cx="28.019106"
cy="38.98439"
fx="28.019106"
fy="38.98439"
r="15.467961"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient35500"
id="linearGradient35506"
x1="21.204315"
y1="21.699249"
x2="20.155914"
y2="-26.908371"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient39155"
id="linearGradient39161"
x1="31.1875"
y1="18.875"
x2="29.875"
y2="34.375"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient39171"
id="radialGradient39177"
cx="26.109201"
cy="19.668886"
fx="26.109201"
fy="19.668886"
r="20.278975"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#e0e0e0"
borderopacity="1"
gridtolerance="10000"
guidetolerance="10"
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6568542"
inkscape:cx="36.038169"
inkscape:cy="25.799649"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="48px"
height="48px"
inkscape:showpageshadow="false"
inkscape:window-width="1046"
inkscape:window-height="975"
inkscape:window-x="345"
inkscape:window-y="0"
showgrid="false"
inkscape:window-maximized="0" />
<metadata
id="metadata7859">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:title></dc:title>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
<cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g3199">
<path
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)"
d="M 43.487067 38.98439 A 15.467961 5.3033009 0 1 1 12.551145,38.98439 A 15.467961 5.3033009 0 1 1 43.487067 38.98439 z"
sodipodi:ry="5.3033009"
sodipodi:rx="15.467961"
sodipodi:cy="38.98439"
sodipodi:cx="28.019106"
id="path35486"
style="opacity:0.54857142;color:black;fill:url(#radialGradient35494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csssssssssscccsscccscccssccc"
d="M 16.048489,28.093447 C 16.058272,28.670129 16.244963,29.791349 16.519605,30.670872 C 17.101171,32.525009 18.086445,34.24353 19.458731,35.757368 C 20.866219,37.310486 22.59725,38.560595 24.598046,39.447128 C 26.703403,40.378701 28.982841,40.854616 31.34818,40.850869 C 33.713519,40.845862 35.992781,40.362183 38.09714,39.423852 C 40.09716,38.528564 41.828183,37.275461 43.23468,35.718335 C 44.603887,34.198491 45.587256,32.477221 46.168769,30.622077 C 46.463031,29.683724 46.64569,28.732685 46.722007,27.776769 C 46.795321,26.837463 46.764043,25.893258 46.630178,24.952977 C 46.370197,23.117378 45.733884,21.39613 44.757526,19.825397 C 43.861985,18.383698 42.709718,17.120857 41.340258,16.058422 C 41.340258,16.058422 41.342254,16.05644 41.342254,16.05644 C 41.342254,16.05644 27.513796,5.4367205 27.513796,5.4367205 C 27.502032,5.4269448 27.491273,5.4171691 27.47851,5.4083763 C 26.569507,4.7124499 25.043735,4.7144005 24.046782,5.4132603 C 23.036112,6.1189624 22.954961,7.2225216 23.851255,7.9614749 C 25.75103,9.4612382 27.643323,11.029515 29.553623,12.529094 C 29.553623,12.529094 12.001942,12.517388 12.001942,12.517388 C 10.007257,12.517388 8.8336816,13.465303 8.5865478,14.851071 C 8.3684707,16.073907 9.3344691,17.5892 11.066569,17.5892 C 14.023142,17.593062 17.00868,17.582341 19.975784,17.576483 C 19.975784,17.576483 4.074061,29.340645 4.074061,29.340645 C 4.0535343,29.356288 4.0330076,29.369972 4.0124809,29.385615 C 2.5150612,30.534004 2.0292858,32.444937 2.9725001,33.654008 C 3.9323324,34.883598 5.9702654,34.884596 7.4872289,33.660013 C 7.4872289,33.660013 16.164822,26.557915 16.164822,26.557915 C 16.164822,26.557915 16.039712,27.517739 16.048489,28.093447 z "
id="path2482"
style="fill:#f57900;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
<path
transform="matrix(0.821621,0,0,0.839506,5.875686,3.882724)"
d="M 42.75 25.75 A 11.5625 10.125 0 1 1 19.625,25.75 A 11.5625 10.125 0 1 1 42.75 25.75 z"
sodipodi:ry="10.125"
sodipodi:rx="11.5625"
sodipodi:cy="25.75"
sodipodi:cx="31.1875"
id="path39153"
style="opacity:1;color:black;fill:url(#linearGradient39161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cssssscscczccsccssssccscccccscssc"
id="path3562"
d="M 25.796988,6.0267804 C 25.392136,6.0273334 24.978369,6.1524748 24.701716,6.3464071 C 24.701002,6.3471213 24.700295,6.3478355 24.699581,6.348542 C 24.419372,6.5441945 24.362722,6.7165481 24.354375,6.8088145 C 24.346027,6.901081 24.341136,6.9760921 24.54403,7.143362 C 24.563021,7.1590969 24.581497,7.1754384 24.599428,7.1923712 C 24.723686,7.2933997 30.303822,11.83132 30.303822,11.83132 C 30.67748,12.135411 30.819662,12.641552 30.659019,13.095735 C 30.498384,13.549926 30.069597,13.478467 29.587845,13.480018 C 23.953703,13.531155 11.978175,13.499193 11.978175,13.499193 C 11.025208,13.499831 9.6308955,14.015986 9.5646031,15.084954 C 9.5010407,16.109901 10.473909,16.542453 11.142862,16.542453 C 11.142862,16.542453 19.973265,16.525405 19.973265,16.525405 C 20.461629,16.524814 20.896122,16.746937 21.053731,17.20916 C 21.211341,17.671391 21.057056,17.74072 20.670067,18.038599 C 20.670067,18.038599 4.7693731,30.244334 4.7693731,30.244334 C 4.7679524,30.245762 4.7665317,30.247183 4.7651111,30.248596 C 4.7010736,30.29739 4.6803396,30.310852 4.703316,30.293351 C 4.1496404,30.717969 3.8072063,31.274071 3.6847449,31.770052 C 3.5622912,32.266033 3.6381548,32.6526 3.8722651,32.952698 C 4.3510984,33.566111 5.6416386,33.684809 6.7702766,32.773702 C 6.7702766,32.773702 15.443001,25.675712 15.443001,25.675712 C 15.804956,25.37996 16.310759,25.335106 16.719112,25.562543 C 17.127457,25.78998 17.355624,26.243625 17.294743,26.707061 C 17.294743,26.707061 17.182241,27.687106 17.188193,28.07722 C 17.38055,30.713627 18.636521,32.992215 20.303559,34.99196 C 23.181305,38.164769 27.152949,39.548245 31.34583,39.711879 C 35.54925,39.667941 39.531614,38.049451 42.388094,34.953602 C 47.607012,28.567735 46.329831,21.589702 40.640768,16.960375 C 36.144381,13.301557 31.427481,9.8791653 26.819821,6.340018 C 26.815528,6.3365009 26.811266,6.3329454 26.807035,6.3293668 C 26.79987,6.3244751 26.792767,6.319499 26.785725,6.314446 C 26.575182,6.1532581 26.201079,6.0262199 25.796988,6.0267804 z "
style="opacity:0.48571429;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient34576);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
d="M 26.007076,24.754048 C 26.081541,23.392891 26.746369,22.191393 27.745781,21.340777 C 28.729299,20.504594 30.049996,19.99403 31.492657,19.99403 C 32.9344,19.99403 34.255098,20.504594 35.238386,21.340777 C 36.238901,22.191393 36.902925,23.39199 36.978261,24.753147 C 37.055437,26.153999 36.495461,27.454723 35.514011,28.418097 C 34.513495,29.399506 33.086912,30.0156 31.492657,30.0156 C 29.897485,30.0156 28.470901,29.399506 27.470432,28.418097 C 26.487971,27.454723 25.929925,26.153999 26.007076,24.754048 z "
id="path2478"
style="fill:#3465a4;fill-rule:evenodd;stroke:none;stroke-width:1.0074476;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
<path
sodipodi:nodetypes="csssscsccsscsccssssscsscccsssc"
id="path39166"
d="M 25.8125,6.03125 C 25.407648,6.0318028 24.964153,6.1498177 24.6875,6.34375 C 24.407291,6.5394023 24.352097,6.7202336 24.34375,6.8125 C 24.335401,6.9047665 24.328356,6.9889801 24.53125,7.15625 C 24.550242,7.1719849 24.575819,7.1705672 24.59375,7.1875 C 24.718008,7.2885283 30.3125,11.84375 30.3125,11.84375 C 30.686158,12.147841 30.816893,12.639567 30.65625,13.09375 C 30.495615,13.547941 30.075502,13.467199 29.59375,13.46875 C 23.959608,13.519887 11.96875,13.5 11.96875,13.5 C 11.015783,13.500638 9.6287924,14.024782 9.5625,15.09375 C 9.4989378,16.118697 10.487297,16.53125 11.15625,16.53125 C 11.15625,16.531249 19.96875,16.53125 19.96875,16.53125 C 20.457114,16.530658 20.904891,16.756527 21.0625,17.21875 C 21.220109,17.680981 21.043239,17.733371 20.65625,18.03125 C 20.65625,18.03125 4.78125,30.25 4.78125,30.25 C 4.7798295,30.251429 4.7514206,30.248587 4.75,30.25 C 4.6859626,30.298794 4.6957736,30.298751 4.71875,30.28125 C 4.1650742,30.705869 3.8099614,31.285269 3.6875,31.78125 C 3.5650464,32.277231 3.6408897,32.637402 3.875,32.9375 C 4.3538333,33.550913 5.652612,33.692357 6.78125,32.78125 C 6.7812501,32.781251 15.4375,25.6875 15.4375,25.6875 C 15.799455,25.391747 16.310397,25.335063 16.71875,25.5625 C 17.127095,25.789936 17.342131,26.255314 17.28125,26.71875 C 17.28125,26.718749 17.181548,27.672386 17.1875,28.0625 C 17.282479,29.364256 17.639116,30.584325 18.176539,31.726734 C 20.799917,36.321089 27.770982,19.392853 44.1875,21.03125 C 43.339652,19.54368 42.151282,18.185293 40.65625,16.96875 C 36.159865,13.309932 31.42016,9.8828973 26.8125,6.34375 C 26.805335,6.3388584 26.788292,6.317553 26.78125,6.3125 C 26.570707,6.1513121 26.216591,6.0306895 25.8125,6.03125 z "
style="opacity:0.52;fill:url(#radialGradient39177);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

View File

@@ -1,246 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64"
height="64"
id="svg7854"
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
version="1.0"
sodipodi:docname="blender.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:modified="true">
<defs
id="defs7856">
<linearGradient
inkscape:collect="always"
id="linearGradient39171">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39173" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop39175" />
</linearGradient>
<linearGradient
id="linearGradient39155">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39157" />
<stop
style="stop-color:#dadada;stop-opacity:1;"
offset="1"
id="stop39159" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35500">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop35502" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop35504" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35488">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop35490" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop35492" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3564">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3566" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop3568" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3564"
id="linearGradient34576"
gradientUnits="userSpaceOnUse"
x1="185.9903"
y1="193.33229"
x2="190.46461"
y2="-458.05771"
gradientTransform="matrix(0.06818845,0,0,0.06818845,22.51112,27.02885)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient35488"
id="radialGradient35494"
cx="28.019106"
cy="38.98439"
fx="28.019106"
fy="38.98439"
r="15.467961"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient35500"
id="linearGradient35506"
x1="21.204315"
y1="21.699249"
x2="20.155914"
y2="-26.908371"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient39155"
id="linearGradient39161"
x1="31.1875"
y1="18.875"
x2="29.875"
y2="34.375"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient39171"
id="radialGradient39177"
cx="26.109201"
cy="19.668886"
fx="26.109201"
fy="19.668886"
r="20.278975"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#e0e0e0"
borderopacity="1"
gridtolerance="10000"
guidetolerance="10"
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.74375"
inkscape:cx="35.434737"
inkscape:cy="23.665112"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="48px"
height="48px"
inkscape:showpageshadow="false"
inkscape:window-width="1046"
inkscape:window-height="975"
inkscape:window-x="345"
inkscape:window-y="0"
showgrid="false"
inkscape:window-maximized="0" />
<metadata
id="metadata7859">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:title></dc:title>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
<cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,16)">
<g
id="g3199"
transform="matrix(1.3520446,0,0,1.3520446,-1.3967542,-16.809965)">
<path
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
sodipodi:ry="5.3033009"
sodipodi:rx="15.467961"
sodipodi:cy="38.98439"
sodipodi:cx="28.019106"
id="path35486"
style="opacity:0.54857142;color:#000000;fill:url(#radialGradient35494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csssssssssscccsscccscccssccc"
d="m 16.048489,28.093447 c 0.0098,0.576682 0.196474,1.697902 0.471116,2.577425 0.581566,1.854137 1.56684,3.572658 2.939126,5.086496 1.407488,1.553118 3.138519,2.803227 5.139315,3.68976 2.105357,0.931573 4.384795,1.407488 6.750134,1.403741 2.365339,-0.005 4.644601,-0.488686 6.74896,-1.427017 2.00002,-0.895288 3.731043,-2.148391 5.13754,-3.705517 1.369207,-1.519844 2.352576,-3.241114 2.934089,-5.096258 0.294262,-0.938353 0.476921,-1.889392 0.553238,-2.845308 0.07331,-0.939306 0.04204,-1.883511 -0.09183,-2.823792 -0.259981,-1.835599 -0.896294,-3.556847 -1.872652,-5.12758 -0.895541,-1.441699 -2.047808,-2.70454 -3.417268,-3.766975 0,0 0.002,-0.002 0.002,-0.002 0,0 -13.828458,-10.6197195 -13.828458,-10.6197195 -0.01176,-0.00978 -0.02252,-0.019551 -0.03529,-0.028344 -0.909003,-0.6959264 -2.434775,-0.6939758 -3.431728,0.00488 -1.01067,0.7057021 -1.091821,1.8092613 -0.195527,2.5482146 1.899775,1.4997633 3.792068,3.0680399 5.702368,4.5676189 0,0 -17.551681,-0.01171 -17.551681,-0.01171 -1.994685,0 -3.1682604,0.947915 -3.4153942,2.333683 -0.2180771,1.222836 0.7479213,2.738129 2.4800212,2.738129 2.956573,0.0039 5.942111,-0.0069 8.909215,-0.01272 0,0 -15.901723,11.764162 -15.901723,11.764162 -0.020527,0.01564 -0.041053,0.02933 -0.06158,0.04497 -1.4974197,1.148389 -1.9831951,3.059322 -1.0399808,4.268393 0.9598323,1.22959 2.9977653,1.230588 4.5147288,0.006 0,0 8.677593,-7.102098 8.677593,-7.102098 0,0 -0.12511,0.959824 -0.116333,1.535532 z"
id="path2482"
style="fill:#f57900;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
transform="matrix(0.821621,0,0,0.839506,5.875686,3.882724)"
d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
sodipodi:ry="10.125"
sodipodi:rx="11.5625"
sodipodi:cy="25.75"
sodipodi:cx="31.1875"
id="path39153"
style="color:#000000;fill:url(#linearGradient39161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cssssscscczccsccssssccscccccscssc"
id="path3562"
d="m 25.796988,6.0267804 c -0.404852,5.53e-4 -0.818619,0.1256944 -1.095272,0.3196267 -7.14e-4,7.142e-4 -0.0014,0.00143 -0.0021,0.00213 -0.280209,0.1956525 -0.336859,0.3680061 -0.345206,0.4602725 -0.0083,0.092266 -0.01324,0.1672776 0.189655,0.3345475 0.01899,0.015735 0.03747,0.032076 0.0554,0.049009 0.124258,0.1010285 5.704394,4.6389489 5.704394,4.6389489 0.373658,0.304091 0.51584,0.810232 0.355197,1.264415 -0.160635,0.454191 -0.589422,0.382732 -1.071174,0.384283 -5.634142,0.05114 -17.60967,0.01918 -17.60967,0.01918 -0.952967,6.38e-4 -2.3472795,0.516793 -2.4135719,1.585761 -0.063562,1.024947 0.9093059,1.457499 1.5782589,1.457499 0,0 8.830403,-0.01705 8.830403,-0.01705 0.488364,-5.91e-4 0.922857,0.221532 1.080466,0.683755 0.15761,0.462231 0.0033,0.53156 -0.383664,0.829439 0,0 -15.9006939,12.205735 -15.9006939,12.205735 -0.00142,0.0014 -0.00284,0.0028 -0.00426,0.0043 -0.064038,0.04879 -0.084772,0.06226 -0.061795,0.04476 -0.5536756,0.424618 -0.8961097,0.98072 -1.0185711,1.476701 -0.1224537,0.495981 -0.04659,0.882548 0.1875202,1.182646 0.4788333,0.613413 1.7693735,0.732111 2.8980115,-0.178996 0,0 8.6727243,-7.09799 8.6727243,-7.09799 0.361955,-0.295752 0.867758,-0.340606 1.276111,-0.113169 0.408345,0.227437 0.636512,0.681082 0.575631,1.144518 0,0 -0.112502,0.980045 -0.10655,1.370159 0.192357,2.636407 1.448328,4.914995 3.115366,6.91474 2.877746,3.172809 6.84939,4.556285 11.042271,4.719919 4.20342,-0.04394 8.185784,-1.662428 11.042264,-4.758277 5.218918,-6.385867 3.941737,-13.3639 -1.747326,-17.993227 C 36.14442,13.301598 31.42752,9.8792062 26.81986,6.3400589 c -0.0043,-0.00352 -0.0086,-0.00707 -0.01279,-0.010651 -0.0072,-0.00489 -0.01427,-0.00987 -0.02131,-0.014921 -0.210578,-0.1612288 -0.584681,-0.288267 -0.988772,-0.2877065 z"
style="opacity:0.4857143;fill:none;stroke:url(#linearGradient34576);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m 26.007076,24.754048 c 0.07447,-1.361157 0.739293,-2.562655 1.738705,-3.413271 0.983518,-0.836183 2.304215,-1.346747 3.746876,-1.346747 1.441743,0 2.762441,0.510564 3.745729,1.346747 1.000515,0.850616 1.664539,2.051213 1.739875,3.41237 0.07718,1.400852 -0.4828,2.701576 -1.46425,3.66495 -1.000516,0.981409 -2.427099,1.597503 -4.021354,1.597503 -1.595172,0 -3.021756,-0.616094 -4.022225,-1.597503 -0.982461,-0.963374 -1.540507,-2.264098 -1.463356,-3.664049 z"
id="path2478"
style="fill:#3465a4;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="csssscsccsscsccssssscsscccsssc"
id="path39166"
d="m 25.8125,6.03125 c -0.404852,5.528e-4 -0.848347,0.1185677 -1.125,0.3125 -0.280209,0.1956523 -0.335403,0.3764836 -0.34375,0.46875 -0.0083,0.092267 -0.01539,0.1764801 0.1875,0.34375 0.01899,0.015735 0.04457,0.014317 0.0625,0.03125 0.124258,0.1010283 5.71875,4.65625 5.71875,4.65625 0.373658,0.304091 0.504393,0.795817 0.34375,1.25 -0.160635,0.454191 -0.580748,0.373449 -1.0625,0.375 -5.634142,0.05114 -17.625,0.03125 -17.625,0.03125 -0.952967,6.38e-4 -2.3399576,0.524782 -2.40625,1.59375 -0.063562,1.024947 0.924797,1.4375 1.59375,1.4375 0,-1e-6 8.8125,0 8.8125,0 0.488364,-5.92e-4 0.936141,0.225277 1.09375,0.6875 0.157609,0.462231 -0.01926,0.514621 -0.40625,0.8125 0,0 -15.875,12.21875 -15.875,12.21875 -0.00142,0.0014 -0.029829,-0.0014 -0.03125,0 -0.064037,0.04879 -0.054226,0.04875 -0.03125,0.03125 -0.5536758,0.424619 -0.9087886,1.004019 -1.03125,1.5 -0.1224536,0.495981 -0.04661,0.856152 0.1875,1.15625 0.4788333,0.613413 1.777612,0.754857 2.90625,-0.15625 1e-7,10e-7 8.65625,-7.09375 8.65625,-7.09375 0.361955,-0.295753 0.872897,-0.352437 1.28125,-0.125 0.408345,0.227436 0.623381,0.692814 0.5625,1.15625 0,-1e-6 -0.0997,0.953636 -0.09375,1.34375 0.09498,1.301756 0.451616,2.521825 0.989039,3.664234 C 20.799917,36.321089 27.770982,19.392853 44.1875,21.03125 43.339652,19.54368 42.151282,18.185293 40.65625,16.96875 36.159865,13.309932 31.42016,9.8828973 26.8125,6.34375 26.805335,6.3388584 26.788292,6.317553 26.78125,6.3125 26.570707,6.1513121 26.216591,6.0306895 25.8125,6.03125 z"
style="opacity:0.51999996;fill:url(#radialGradient39177);fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

View File

@@ -1,249 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="96"
height="96"
id="svg7854"
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
version="1.0"
sodipodi:docname="blender.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:modified="true"
inkscape:export-filename="/home/user/my/blender/builds/blender/release/freedesktop/icons/96x96/blender.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs7856">
<linearGradient
inkscape:collect="always"
id="linearGradient39171">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39173" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop39175" />
</linearGradient>
<linearGradient
id="linearGradient39155">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39157" />
<stop
style="stop-color:#dadada;stop-opacity:1;"
offset="1"
id="stop39159" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35500">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop35502" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop35504" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35488">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop35490" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop35492" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3564">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3566" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop3568" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3564"
id="linearGradient34576"
gradientUnits="userSpaceOnUse"
x1="185.9903"
y1="193.33229"
x2="190.46461"
y2="-458.05771"
gradientTransform="matrix(0.06818845,0,0,0.06818845,22.51112,27.02885)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient35488"
id="radialGradient35494"
cx="28.019106"
cy="38.98439"
fx="28.019106"
fy="38.98439"
r="15.467961"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient35500"
id="linearGradient35506"
x1="21.204315"
y1="21.699249"
x2="20.155914"
y2="-26.908371"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient39155"
id="linearGradient39161"
x1="31.1875"
y1="18.875"
x2="29.875"
y2="34.375"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient39171"
id="radialGradient39177"
cx="26.109201"
cy="19.668886"
fx="26.109201"
fy="19.668886"
r="20.278975"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#e0e0e0"
borderopacity="1"
gridtolerance="10000"
guidetolerance="10"
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="4.0614446"
inkscape:cx="20.689151"
inkscape:cy="16.128681"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="48px"
height="48px"
inkscape:showpageshadow="false"
inkscape:window-width="1046"
inkscape:window-height="975"
inkscape:window-x="345"
inkscape:window-y="0"
showgrid="false"
inkscape:window-maximized="0" />
<metadata
id="metadata7859">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:title></dc:title>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
<cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,48)">
<g
id="g3199"
transform="matrix(2.0204812,0,0,2.0204812,-2.2340817,-49.121887)">
<path
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
sodipodi:ry="5.3033009"
sodipodi:rx="15.467961"
sodipodi:cy="38.98439"
sodipodi:cx="28.019106"
id="path35486"
style="opacity:0.54857142;color:#000000;fill:url(#radialGradient35494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csssssssssscccsscccscccssccc"
d="m 16.048489,28.093447 c 0.0098,0.576682 0.196474,1.697902 0.471116,2.577425 0.581566,1.854137 1.56684,3.572658 2.939126,5.086496 1.407488,1.553118 3.138519,2.803227 5.139315,3.68976 2.105357,0.931573 4.384795,1.407488 6.750134,1.403741 2.365339,-0.005 4.644601,-0.488686 6.74896,-1.427017 2.00002,-0.895288 3.731043,-2.148391 5.13754,-3.705517 1.369207,-1.519844 2.352576,-3.241114 2.934089,-5.096258 0.294262,-0.938353 0.476921,-1.889392 0.553238,-2.845308 0.07331,-0.939306 0.04204,-1.883511 -0.09183,-2.823792 -0.259981,-1.835599 -0.896294,-3.556847 -1.872652,-5.12758 -0.895541,-1.441699 -2.047808,-2.70454 -3.417268,-3.766975 0,0 0.002,-0.002 0.002,-0.002 0,0 -13.828458,-10.6197195 -13.828458,-10.6197195 -0.01176,-0.00978 -0.02252,-0.019551 -0.03529,-0.028344 -0.909003,-0.6959264 -2.434775,-0.6939758 -3.431728,0.00488 -1.01067,0.7057021 -1.091821,1.8092613 -0.195527,2.5482146 1.899775,1.4997633 3.792068,3.0680399 5.702368,4.5676189 0,0 -17.551681,-0.01171 -17.551681,-0.01171 -1.994685,0 -3.1682604,0.947915 -3.4153942,2.333683 -0.2180771,1.222836 0.7479213,2.738129 2.4800212,2.738129 2.956573,0.0039 5.942111,-0.0069 8.909215,-0.01272 0,0 -15.901723,11.764162 -15.901723,11.764162 -0.020527,0.01564 -0.041053,0.02933 -0.06158,0.04497 -1.4974197,1.148389 -1.9831951,3.059322 -1.0399808,4.268393 0.9598323,1.22959 2.9977653,1.230588 4.5147288,0.006 0,0 8.677593,-7.102098 8.677593,-7.102098 0,0 -0.12511,0.959824 -0.116333,1.535532 z"
id="path2482"
style="fill:#f57900;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
transform="matrix(0.821621,0,0,0.839506,5.875686,3.882724)"
d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
sodipodi:ry="10.125"
sodipodi:rx="11.5625"
sodipodi:cy="25.75"
sodipodi:cx="31.1875"
id="path39153"
style="color:#000000;fill:url(#linearGradient39161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cssssscscczccsccssssccscccccscssc"
id="path3562"
d="m 25.796988,6.0267804 c -0.404852,5.53e-4 -0.818619,0.1256944 -1.095272,0.3196267 -7.14e-4,7.142e-4 -0.0014,0.00143 -0.0021,0.00213 -0.280209,0.1956525 -0.336859,0.3680061 -0.345206,0.4602725 -0.0083,0.092266 -0.01324,0.1672776 0.189655,0.3345475 0.01899,0.015735 0.03747,0.032076 0.0554,0.049009 0.124258,0.1010285 5.704394,4.6389489 5.704394,4.6389489 0.373658,0.304091 0.51584,0.810232 0.355197,1.264415 -0.160635,0.454191 -0.589422,0.382732 -1.071174,0.384283 -5.634142,0.05114 -17.60967,0.01918 -17.60967,0.01918 -0.952967,6.38e-4 -2.3472795,0.516793 -2.4135719,1.585761 -0.063562,1.024947 0.9093059,1.457499 1.5782589,1.457499 0,0 8.830403,-0.01705 8.830403,-0.01705 0.488364,-5.91e-4 0.922857,0.221532 1.080466,0.683755 0.15761,0.462231 0.0033,0.53156 -0.383664,0.829439 0,0 -15.9006939,12.205735 -15.9006939,12.205735 -0.00142,0.0014 -0.00284,0.0028 -0.00426,0.0043 -0.064038,0.04879 -0.084772,0.06226 -0.061795,0.04476 -0.5536756,0.424618 -0.8961097,0.98072 -1.0185711,1.476701 -0.1224537,0.495981 -0.04659,0.882548 0.1875202,1.182646 0.4788333,0.613413 1.7693735,0.732111 2.8980115,-0.178996 0,0 8.6727243,-7.09799 8.6727243,-7.09799 0.361955,-0.295752 0.867758,-0.340606 1.276111,-0.113169 0.408345,0.227437 0.636512,0.681082 0.575631,1.144518 0,0 -0.112502,0.980045 -0.10655,1.370159 0.192357,2.636407 1.448328,4.914995 3.115366,6.91474 2.877746,3.172809 6.84939,4.556285 11.042271,4.719919 4.20342,-0.04394 8.185784,-1.662428 11.042264,-4.758277 5.218918,-6.385867 3.941737,-13.3639 -1.747326,-17.993227 C 36.14442,13.301598 31.42752,9.8792062 26.81986,6.3400589 c -0.0043,-0.00352 -0.0086,-0.00707 -0.01279,-0.010651 -0.0072,-0.00489 -0.01427,-0.00987 -0.02131,-0.014921 -0.210578,-0.1612288 -0.584681,-0.288267 -0.988772,-0.2877065 z"
style="opacity:0.4857143;fill:none;stroke:url(#linearGradient34576);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m 26.007076,24.754048 c 0.07447,-1.361157 0.739293,-2.562655 1.738705,-3.413271 0.983518,-0.836183 2.304215,-1.346747 3.746876,-1.346747 1.441743,0 2.762441,0.510564 3.745729,1.346747 1.000515,0.850616 1.664539,2.051213 1.739875,3.41237 0.07718,1.400852 -0.4828,2.701576 -1.46425,3.66495 -1.000516,0.981409 -2.427099,1.597503 -4.021354,1.597503 -1.595172,0 -3.021756,-0.616094 -4.022225,-1.597503 -0.982461,-0.963374 -1.540507,-2.264098 -1.463356,-3.664049 z"
id="path2478"
style="fill:#3465a4;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="csssscsccsscsccssssscsscccsssc"
id="path39166"
d="m 25.8125,6.03125 c -0.404852,5.528e-4 -0.848347,0.1185677 -1.125,0.3125 -0.280209,0.1956523 -0.335403,0.3764836 -0.34375,0.46875 -0.0083,0.092267 -0.01539,0.1764801 0.1875,0.34375 0.01899,0.015735 0.04457,0.014317 0.0625,0.03125 0.124258,0.1010283 5.71875,4.65625 5.71875,4.65625 0.373658,0.304091 0.504393,0.795817 0.34375,1.25 -0.160635,0.454191 -0.580748,0.373449 -1.0625,0.375 -5.634142,0.05114 -17.625,0.03125 -17.625,0.03125 -0.952967,6.38e-4 -2.3399576,0.524782 -2.40625,1.59375 -0.063562,1.024947 0.924797,1.4375 1.59375,1.4375 0,-1e-6 8.8125,0 8.8125,0 0.488364,-5.92e-4 0.936141,0.225277 1.09375,0.6875 0.157609,0.462231 -0.01926,0.514621 -0.40625,0.8125 0,0 -15.875,12.21875 -15.875,12.21875 -0.00142,0.0014 -0.029829,-0.0014 -0.03125,0 -0.064037,0.04879 -0.054226,0.04875 -0.03125,0.03125 -0.5536758,0.424619 -0.9087886,1.004019 -1.03125,1.5 -0.1224536,0.495981 -0.04661,0.856152 0.1875,1.15625 0.4788333,0.613413 1.777612,0.754857 2.90625,-0.15625 1e-7,10e-7 8.65625,-7.09375 8.65625,-7.09375 0.361955,-0.295753 0.872897,-0.352437 1.28125,-0.125 0.408345,0.227436 0.623381,0.692814 0.5625,1.15625 0,-1e-6 -0.0997,0.953636 -0.09375,1.34375 0.09498,1.301756 0.451616,2.521825 0.989039,3.664234 C 20.799917,36.321089 27.770982,19.392853 44.1875,21.03125 43.339652,19.54368 42.151282,18.185293 40.65625,16.96875 36.159865,13.309932 31.42016,9.8828973 26.8125,6.34375 26.805335,6.3388584 26.788292,6.317553 26.78125,6.3125 26.570707,6.1513121 26.216591,6.0306895 25.8125,6.03125 z"
style="opacity:0.51999996;fill:url(#radialGradient39177);fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -0,0 +1,855 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90.000000"
inkscape:export-xdpi="90.000000"
inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
width="400"
height="300"
id="svg11300"
sodipodi:version="0.32"
inkscape:version="0.48.1 r9760"
sodipodi:docname="blender.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
style="enable-background:new">
<sodipodi:namedview
stroke="#ef2929"
fill="#f57900"
id="base"
pagecolor="#474747"
bordercolor="#666666"
borderopacity="0.25490196"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="102.02872"
inkscape:cy="157.85704"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
inkscape:window-width="1278"
inkscape:window-height="973"
inkscape:window-x="1906"
inkscape:window-y="126"
width="400px"
height="300px"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid5883"
spacingx="1px"
spacingy="1px" />
</sodipodi:namedview>
<defs
id="defs3">
<linearGradient
inkscape:collect="always"
id="linearGradient9792">
<stop
style="stop-color:#1064aa;stop-opacity:1"
offset="0"
id="stop9794" />
<stop
style="stop-color:#0d528b;stop-opacity:1"
offset="1"
id="stop9796" />
</linearGradient>
<inkscape:perspective
id="perspective105"
inkscape:persp3d-origin="300 : 400 : 1"
inkscape:vp_z="700 : 600 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="-50 : 600 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective5151"
inkscape:persp3d-origin="300 : 400 : 1"
inkscape:vp_z="700 : 600 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="-50 : 600 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
inkscape:persp3d-origin="300 : 400 : 1"
inkscape:vp_z="700 : 600 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="-50 : 600 : 1"
id="perspective103"
sodipodi:type="inkscape:persp3d" />
<linearGradient
id="linearGradient5457"
inkscape:collect="always">
<stop
id="stop5459"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop5461"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient5447"
inkscape:collect="always">
<stop
id="stop5449"
offset="0"
style="stop-color:#ff830a;stop-opacity:1" />
<stop
id="stop5451"
offset="1"
style="stop-color:#d06700;stop-opacity:1" />
</linearGradient>
<inkscape:perspective
inkscape:persp3d-origin="300 : 400 : 1"
inkscape:vp_z="700 : 600 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="-50 : 600 : 1"
id="perspective91"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
inkscape:persp3d-origin="300 : 400 : 1"
inkscape:vp_z="700 : 600 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="-50 : 600 : 1"
id="perspective90"
sodipodi:type="inkscape:persp3d" />
<linearGradient
id="linearGradient6160"
inkscape:collect="always">
<stop
id="stop6162"
offset="0"
style="stop-color:#eeeeec;stop-opacity:1;" />
<stop
id="stop6164"
offset="1"
style="stop-color:#eeeeec;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient6115"
inkscape:collect="always">
<stop
id="stop6117"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop6119"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient39171"
id="radialGradient39177"
cx="26.109201"
cy="19.668886"
fx="26.109201"
fy="19.668886"
r="20.278975"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient39155"
id="linearGradient39161"
x1="31.1875"
y1="18.875"
x2="29.875"
y2="34.375"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient35488"
id="radialGradient35494"
cx="28.019106"
cy="38.98439"
fx="28.019106"
fy="38.98439"
r="15.467961"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3564"
id="linearGradient34576"
gradientUnits="userSpaceOnUse"
x1="185.9903"
y1="193.33229"
x2="106.04736"
y2="-134.32658"
gradientTransform="matrix(6.818845e-2,0,0,6.818845e-2,22.51112,27.02885)" />
<linearGradient
inkscape:collect="always"
id="linearGradient3564">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3566" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop3568" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient35488">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop35490" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop35492" />
</linearGradient>
<linearGradient
id="linearGradient39155">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39157" />
<stop
style="stop-color:#dadada;stop-opacity:1;"
offset="1"
id="stop39159" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient39171">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop39173" />
<stop
style="stop-color:white;stop-opacity:0;"
offset="1"
id="stop39175" />
</linearGradient>
<radialGradient
r="15.467961"
fy="40.303635"
fx="28.915268"
cy="40.303635"
cx="28.915268"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse"
id="radialGradient5348"
xlink:href="#linearGradient35488"
inkscape:collect="always" />
<linearGradient
y2="34.375"
x2="29.875"
y1="18.875"
x1="31.1875"
gradientUnits="userSpaceOnUse"
id="linearGradient5350"
xlink:href="#linearGradient39155"
inkscape:collect="always" />
<radialGradient
r="15.467961"
fy="38.98439"
fx="28.019106"
cy="38.98439"
cx="28.019106"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse"
id="radialGradient5444"
xlink:href="#linearGradient35488"
inkscape:collect="always" />
<linearGradient
y2="34.375"
x2="29.875"
y1="18.875"
x1="31.1875"
gradientUnits="userSpaceOnUse"
id="linearGradient5446"
xlink:href="#linearGradient39155"
inkscape:collect="always" />
<linearGradient
y2="-247.19307"
x2="-71.578575"
y1="43.460403"
x1="2.813544"
gradientTransform="matrix(6.818845e-2,0,0,6.818845e-2,22.51112,27.02885)"
gradientUnits="userSpaceOnUse"
id="linearGradient5448"
xlink:href="#linearGradient3564"
inkscape:collect="always" />
<radialGradient
r="20.278975"
fy="19.668886"
fx="26.109201"
cy="19.668886"
cx="26.109201"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse"
id="radialGradient5450"
xlink:href="#linearGradient39171"
inkscape:collect="always" />
<radialGradient
r="15.467961"
fy="38.98439"
fx="28.019106"
cy="38.98439"
cx="28.019106"
gradientTransform="matrix(1,0,0,0.342857,0,25.61831)"
gradientUnits="userSpaceOnUse"
id="radialGradient5482"
xlink:href="#linearGradient35488"
inkscape:collect="always" />
<filter
height="1.60714"
y="-0.30357"
width="1.2081623"
x="-0.10408114"
id="filter6077"
inkscape:collect="always">
<feGaussianBlur
id="feGaussianBlur6079"
stdDeviation="1.3416025"
inkscape:collect="always" />
</filter>
<clipPath
id="clipPath6085"
clipPathUnits="userSpaceOnUse">
<path
style="fill:none;fill-rule:evenodd;stroke:#954900;stroke-width:0.2076302;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path6087"
d="M 16.048489,28.093447 C 16.058272,28.670129 16.244963,29.791349 16.519605,30.670872 C 17.101171,32.525009 18.086445,34.24353 19.458731,35.757368 C 20.866219,37.310486 22.59725,38.560595 24.598046,39.447128 C 26.703403,40.378701 28.982841,40.854616 31.34818,40.850869 C 33.713519,40.845862 35.992781,40.362183 38.09714,39.423852 C 40.09716,38.528564 41.828183,37.275461 43.23468,35.718335 C 44.603887,34.198491 45.587256,32.477221 46.168769,30.622077 C 46.463031,29.683724 46.64569,28.732685 46.722007,27.776769 C 46.795321,26.837463 46.764043,25.893258 46.630178,24.952977 C 46.370197,23.117378 45.733884,21.39613 44.757526,19.825397 C 43.861985,18.383698 42.709718,17.120857 41.340258,16.058422 C 41.340258,16.058422 41.342254,16.05644 41.342254,16.05644 C 41.342254,16.05644 27.513796,5.4367205 27.513796,5.4367205 C 27.502032,5.4269448 27.491273,5.4171691 27.47851,5.4083763 C 26.569507,4.7124499 25.043735,4.7144005 24.046782,5.4132603 C 23.036112,6.1189624 22.954961,7.2225216 23.851255,7.9614749 C 25.75103,9.4612382 27.643323,11.029515 29.553623,12.529094 C 29.553623,12.529094 12.001942,12.517388 12.001942,12.517388 C 10.007257,12.517388 8.8336816,13.465303 8.5865478,14.851071 C 8.3684707,16.073907 9.3344691,17.5892 11.066569,17.5892 C 14.023142,17.593062 17.00868,17.582341 19.975784,17.576483 C 19.975784,17.576483 4.074061,29.340645 4.074061,29.340645 C 4.0535343,29.356288 4.0330076,29.369972 4.0124809,29.385615 C 2.5150612,30.534004 2.0292858,32.444937 2.9725001,33.654008 C 3.9323324,34.883598 5.9702654,34.884596 7.4872289,33.660013 C 7.4872289,33.660013 16.164822,26.557915 16.164822,26.557915 C 16.164822,26.557915 16.039712,27.517739 16.048489,28.093447 z"
sodipodi:nodetypes="csssssssssscccsscccscccssccc" />
</clipPath>
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.8055409,0,4.4643372)"
r="21.275852"
fy="44.23357"
fx="34.8689"
cy="44.23357"
cx="34.8689"
id="radialGradient6101"
xlink:href="#linearGradient3564"
inkscape:collect="always" />
<filter
id="filter6103"
inkscape:collect="always">
<feGaussianBlur
id="feGaussianBlur6105"
stdDeviation="0.19207211"
inkscape:collect="always" />
</filter>
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.8095091,0,4.3545041)"
r="21.804204"
fy="13.112802"
fx="22.436661"
cy="13.112802"
cx="22.436661"
id="radialGradient6121"
xlink:href="#linearGradient6115"
inkscape:collect="always" />
<filter
id="filter6127"
inkscape:collect="always">
<feGaussianBlur
id="feGaussianBlur6129"
stdDeviation="0.098637264"
inkscape:collect="always" />
</filter>
<filter
id="filter6156"
inkscape:collect="always">
<feGaussianBlur
id="feGaussianBlur6158"
stdDeviation="0.93085205"
inkscape:collect="always" />
</filter>
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1062168,0,0,0.7160758,-16.531813,35.180186)"
r="113.01414"
fy="58.663204"
fx="155.64211"
cy="58.663204"
cx="155.64211"
id="radialGradient6166"
xlink:href="#linearGradient6160"
inkscape:collect="always" />
<radialGradient
r="20.278975"
fy="16.789225"
fx="26.441687"
cy="16.789225"
cx="26.441687"
gradientTransform="matrix(1.647222,0,0,1.26792,-15.47413,-5.79794)"
gradientUnits="userSpaceOnUse"
id="radialGradient6168"
xlink:href="#linearGradient39171"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.6103065,0,0,1.308109,-19.819726,-14.288347)"
r="22.135636"
fy="37.477009"
fx="32.475037"
cy="37.477009"
cx="32.475037"
id="radialGradient5453"
xlink:href="#linearGradient5447"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.0461723,0,0,2.2699636,-34.350196,-238.66924)"
r="7.4158326"
fy="188.28326"
fx="32.834167"
cy="188.28326"
cx="32.834167"
id="radialGradient5463"
xlink:href="#linearGradient5457"
inkscape:collect="always" />
<filter
height="1.348965"
y="-0.17448251"
width="1.3871316"
x="-0.19356578"
id="filter5489"
inkscape:collect="always">
<feGaussianBlur
id="feGaussianBlur5491"
stdDeviation="1.1962095"
inkscape:collect="always" />
</filter>
<filter
id="filter5467"
inkscape:collect="always">
<feGaussianBlur
id="feGaussianBlur5469"
stdDeviation="0.20058598"
inkscape:collect="always" />
</filter>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective18062" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective19694" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective19708" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective19722" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient9792"
id="radialGradient9798"
cx="31.857779"
cy="22.970091"
fx="31.857779"
fy="22.970091"
r="5.8577784"
gradientTransform="matrix(1.2493214,0,0,0.91226922,-7.942827,2.2083028)"
gradientUnits="userSpaceOnUse" />
</defs>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
<dc:title>Folder</dc:title>
<dc:subject>
<rdf:Bag>
<rdf:li>dir</rdf:li>
<rdf:li>folder</rdf:li>
</rdf:Bag>
</dc:subject>
<dc:date />
<dc:rights>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:rights>
<dc:publisher>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:publisher>
<dc:identifier />
<dc:relation />
<dc:language />
<dc:coverage />
<dc:description />
<dc:contributor>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:contributor>
</cc:Work>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="baseplate"
style="display:none">
<rect
style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect6282"
width="256"
height="256"
x="20"
y="20"
inkscape:label="256x256" />
<rect
inkscape:label="48x48"
y="39.99633"
x="296.0625"
height="48"
width="48"
id="rect6284"
style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect6592"
width="32"
height="32"
x="303"
y="115.99633"
inkscape:label="32x32" />
<rect
inkscape:label="22x22"
y="167.05884"
x="303"
height="22"
width="22"
id="rect6749"
style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect6833"
width="16"
height="16"
x="303"
y="209"
inkscape:label="16x16" />
<rect
style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect5028"
width="24"
height="24"
x="301.95709"
y="165.95343"
inkscape:label="24x24" />
<text
inkscape:label="context"
sodipodi:linespacing="125%"
id="context"
y="-18.999996"
x="21"
style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new;font-family:Trebuchet MS;-inkscape-font-specification:Trebuchet MS"
xml:space="preserve"><tspan
y="-18.999996"
x="21"
id="tspan16843"
sodipodi:role="line">apps</tspan></text>
<text
inkscape:label="icon-name"
sodipodi:linespacing="125%"
id="icon-name"
y="-18.999996"
x="159"
style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new;font-family:Trebuchet MS;-inkscape-font-specification:Trebuchet MS"
xml:space="preserve"><tspan
y="-18.999996"
x="159"
id="tspan16847"
sodipodi:role="line">blender</tspan></text>
</g>
<g
id="layer1"
inkscape:label="artwork"
inkscape:groupmode="layer"
style="display:inline">
<g
transform="translate(294.96666,38.974759)"
inkscape:label="Layer 1"
id="g5323">
<g
id="g4390">
<path
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
sodipodi:ry="5.3033009"
sodipodi:rx="15.467961"
sodipodi:cy="38.98439"
sodipodi:cx="28.019106"
id="path35486"
style="opacity:0.54857142;fill:url(#radialGradient35494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="csssssssssscccsscccscccssccc"
d="m 16.048489,28.093447 c 0.0098,0.576682 0.196474,1.697902 0.471116,2.577425 0.581566,1.854137 1.56684,3.572658 2.939126,5.086496 1.407488,1.553118 3.138519,2.803227 5.139315,3.68976 2.105357,0.931573 4.384795,1.407488 6.750134,1.403741 2.365339,-0.005 4.644601,-0.488686 6.74896,-1.427017 2.00002,-0.895288 3.731043,-2.148391 5.13754,-3.705517 1.369207,-1.519844 2.352576,-3.241114 2.934089,-5.096258 0.294262,-0.938353 0.476921,-1.889392 0.553238,-2.845308 0.07331,-0.939306 0.04204,-1.883511 -0.09183,-2.823792 -0.259981,-1.835599 -0.896294,-3.556847 -1.872652,-5.12758 -0.895541,-1.441699 -2.047808,-2.70454 -3.417268,-3.766975 0,0 0.002,-0.002 0.002,-0.002 0,0 -13.828458,-10.6197195 -13.828458,-10.6197195 -0.01176,-0.00978 -0.02252,-0.019551 -0.03529,-0.028344 -0.909003,-0.6959264 -2.434775,-0.6939758 -3.431728,0.00488 -1.01067,0.7057021 -1.091821,1.8092613 -0.195527,2.5482146 1.899775,1.4997633 3.792068,3.0680401 5.702368,4.5676191 0,0 -17.551681,-0.01171 -17.551681,-0.01171 -1.994685,0 -3.1682604,0.947915 -3.4153942,2.333683 -0.2180771,1.222836 0.7479213,2.738129 2.4800212,2.738129 2.956573,0.0039 5.942111,-0.0069 8.909215,-0.01272 0,0 -15.901723,11.764162 -15.901723,11.764162 -0.020527,0.01564 -0.041053,0.02933 -0.06158,0.04497 -1.4974197,1.148389 -1.9831951,3.059322 -1.0399808,4.268393 0.9598323,1.22959 2.9977653,1.230588 4.5147288,0.006 0,0 8.6775931,-7.102098 8.6775931,-7.102098 0,0 -0.12511,0.959824 -0.116333,1.535532 z"
id="path2482"
style="fill:#f57900;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
transform="matrix(0.821621,0,0,0.839506,5.875686,3.882724)"
d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
sodipodi:ry="10.125"
sodipodi:rx="11.5625"
sodipodi:cy="25.75"
sodipodi:cx="31.1875"
id="path39153"
style="fill:url(#linearGradient39161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cssssscscczccsccssssccscccccscssc"
id="path3562"
d="m 25.796988,6.0267804 c -0.404852,5.53e-4 -0.818619,0.1256944 -1.095272,0.3196267 -7.14e-4,7.142e-4 -0.0014,0.00143 -0.0021,0.00213 -0.280209,0.1956525 -0.336859,0.3680061 -0.345206,0.4602725 -0.0083,0.092266 -0.01324,0.1672776 0.189655,0.3345475 0.01899,0.015735 0.03747,0.032076 0.0554,0.049009 0.124258,0.1010285 5.704394,4.6389488 5.704394,4.6389488 0.373658,0.304091 0.51584,0.810232 0.355197,1.264415 -0.160635,0.454191 -0.589422,0.382732 -1.071174,0.384283 -5.634142,0.05114 -17.60967,0.01918 -17.60967,0.01918 -0.952967,6.38e-4 -2.3472795,0.516793 -2.4135719,1.585761 -0.063562,1.024947 0.9093059,1.457499 1.5782589,1.457499 0,0 8.830403,-0.01705 8.830403,-0.01705 0.488364,-5.91e-4 0.922857,0.221532 1.080466,0.683755 0.15761,0.462231 0.0033,0.53156 -0.383664,0.829439 0,0 -15.9006939,12.205735 -15.9006939,12.205735 -0.00142,0.0014 -0.00284,0.0028 -0.00426,0.0043 -0.064038,0.04879 -0.084772,0.06226 -0.061795,0.04476 -0.5536756,0.424618 -0.8961097,0.98072 -1.0185711,1.476701 -0.1224537,0.495981 -0.04659,0.882548 0.1875202,1.182646 0.4788333,0.613413 1.8577618,0.820499 2.9863998,-0.09061 0,0 8.6727241,-7.09799 8.6727241,-7.09799 0.361955,-0.295752 0.77937,-0.340606 1.187723,-0.113169 0.408345,0.227437 0.548124,0.592694 0.487243,1.05613 0,0 -0.112502,0.980045 -0.10655,1.370159 0.192357,2.636407 1.448328,5.003383 3.115366,7.003128 2.877746,3.172809 6.937778,4.644674 11.130659,4.808308 4.20342,-0.04394 8.318367,-1.795011 11.174847,-4.89086 5.218918,-6.385867 3.809154,-13.408094 -1.879909,-18.037421 -4.496387,-3.658818 -9.213287,-7.0812097 -13.820947,-10.620357 -0.0043,-0.00352 -0.0086,-0.00707 -0.01279,-0.010651 -0.0072,-0.00489 -0.01427,-0.00987 -0.02131,-0.014921 C 26.575182,6.1532581 26.201079,6.0262199 25.796988,6.0267804 z"
style="opacity:0.4857143;fill:none;stroke:url(#linearGradient34576);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
d="m 25.653978,25.09146 c 0.07926,-1.448773 0.78688,-2.727609 1.850623,-3.632978 1.046825,-0.890007 2.452533,-1.433435 3.988056,-1.433435 1.534545,0 2.940254,0.543428 3.986835,1.433435 1.064917,0.905369 1.771683,2.183246 1.851868,3.632019 0.08215,1.491022 -0.513877,2.875471 -1.558501,3.900856 -1.064918,1.044581 -2.583328,1.700332 -4.280202,1.700332 -1.697851,0 -3.216262,-0.655751 -4.281129,-1.700332 -1.045701,-1.025385 -1.639667,-2.409834 -1.55755,-3.899897 z"
id="path2478"
style="fill:#0d528b;fill-rule:evenodd;stroke:none;opacity:1"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cccczscccssssscsscsss"
id="path39166"
d="m 24.59375,7.1875 c 0,0 5.71875,4.65625 5.71875,4.65625 0.495581,0.404913 0.140487,1.262555 -0.78125,1.25 -5.634142,0.05114 -17.375,-0.03125 -17.375,-0.03125 -0.83333,0 -2.34375,0.577974 -2.34375,1.6875 0,1.109526 0.674797,1.256826 1.34375,1.25092 10e-7,0 8.8125,0 8.8125,0 1.45524,0.03051 1.617186,1.227393 0.6875,2.03033 0,0 -15.875,12.21875 -15.875,12.21875 -0.00142,0.0014 -0.029829,-0.0014 -0.03125,0 -0.064037,0.04879 -0.054226,0.04875 -0.03125,0.03125 -0.5536758,0.424619 -0.9087886,1.004019 -1.03125,1.5 -0.1224536,0.495981 -0.04661,0.856152 0.1875,1.15625 0.4788333,0.613413 1.7334178,0.312915 2.8620558,-0.598192 10e-8,10e-7 8.5678612,-7.049556 8.5678612,-7.049556 0.825495,-0.683682 2.569434,-0.118316 2.418275,1.384804 -0.225591,2.243266 0.09704,3.321215 0.922097,5.052178 2.275388,4.773775 9.8328,-12.333881 26.249318,-10.695484 -0.847848,-1.48757 -2.036218,-3.155316 -3.53125,-4.371859 C 36.866972,13.000573 27.607995,6.1227791 27.607995,6.1227791 26.244584,5.10849 23.323901,5.9514388 24.59375,7.1875 z"
style="opacity:0.51999996;fill:url(#radialGradient39177);fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
</g>
<g
id="g5332"
inkscape:label="Layer 1"
transform="matrix(5.4776822,0,0,5.4776822,10.728205,6.96691)">
<g
id="g5334">
<path
transform="matrix(0.6403051,0,0,0.6919793,12.73379,11.876691)"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
sodipodi:ry="5.3033009"
sodipodi:rx="15.467961"
sodipodi:cy="38.98439"
sodipodi:cx="28.019106"
id="path5480"
style="fill:url(#radialGradient5482);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="opacity:0.7837838;fill:url(#radialGradient5348);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6077);enable-background:accumulate"
id="path5336"
sodipodi:cx="28.019106"
sodipodi:cy="38.98439"
sodipodi:rx="15.467961"
sodipodi:ry="5.3033009"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)" />
<path
style="fill:url(#radialGradient5453);fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path5338"
d="m 16.048489,28.093447 c 0.0098,0.576682 0.196474,1.697902 0.471116,2.577425 0.581566,1.854137 1.56684,3.572658 2.939126,5.086496 1.407488,1.553118 3.138519,2.803227 5.139315,3.68976 2.105357,0.931573 4.384795,1.407488 6.750134,1.403741 2.365339,-0.005 4.644601,-0.488686 6.74896,-1.427017 2.00002,-0.895288 3.731043,-2.148391 5.13754,-3.705517 1.369207,-1.519844 2.352576,-3.241114 2.934089,-5.096258 0.294262,-0.938353 0.476921,-1.889392 0.553238,-2.845308 0.07331,-0.939306 0.04204,-1.883511 -0.09183,-2.823792 -0.259981,-1.835599 -0.896294,-3.556847 -1.872652,-5.12758 -0.895541,-1.441699 -2.047808,-2.70454 -3.417268,-3.766975 0,0 0.002,-0.002 0.002,-0.002 0,0 -13.828458,-10.6197195 -13.828458,-10.6197195 -0.01176,-0.00978 -0.02252,-0.019551 -0.03529,-0.028344 -0.909003,-0.6959264 -2.434775,-0.6939758 -3.431728,0.00488 -1.01067,0.7057021 -1.091821,1.8092613 -0.195527,2.5482146 1.899775,1.4997633 3.792068,3.0680401 5.702368,4.5676191 0,0 -17.551681,-0.01171 -17.551681,-0.01171 -1.994685,0 -3.1682604,0.947915 -3.4153942,2.333683 -0.2180771,1.222836 0.7479213,2.738129 2.4800212,2.738129 2.956573,0.0039 5.942111,-0.0069 8.909215,-0.01272 0,0 -15.901723,11.764162 -15.901723,11.764162 -0.020527,0.01564 -0.041053,0.02933 -0.06158,0.04497 -1.4974197,1.148389 -1.9831951,3.059322 -1.0399808,4.268393 0.9598323,1.22959 2.9977653,1.230588 4.5147288,0.006 0,0 8.6775931,-7.102098 8.6775931,-7.102098 0,0 -0.12511,0.959824 -0.116333,1.535532 z"
sodipodi:nodetypes="csssssssssscccsscccscccssccc" />
<path
sodipodi:type="arc"
style="fill:url(#linearGradient5350);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path5340"
sodipodi:cx="31.1875"
sodipodi:cy="25.75"
sodipodi:rx="11.5625"
sodipodi:ry="10.125"
d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
transform="matrix(0.821621,0,0,0.839506,5.875686,3.882724)" />
<path
style="opacity:0.4857143;fill:none;stroke:url(#radialGradient6101);stroke-width:0.36511794;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter6103)"
d="m 25.796988,6.0267804 c -0.404852,5.53e-4 -0.818619,0.1256944 -1.095272,0.3196267 -7.14e-4,7.142e-4 -0.0014,0.00143 -0.0021,0.00213 -0.280209,0.1956525 -0.336859,0.3680061 -0.345206,0.4602725 -0.0083,0.092266 -0.01324,0.1672776 0.189655,0.3345475 0.01899,0.015735 0.03747,0.032076 0.0554,0.049009 0.124258,0.1010285 5.704394,4.6389488 5.704394,4.6389488 0.373658,0.304091 0.51584,0.810232 0.355197,1.264415 -0.160635,0.454191 -0.589422,0.382732 -1.071174,0.384283 -5.634142,0.05114 -17.60967,0.01918 -17.60967,0.01918 -0.952967,6.38e-4 -2.3472795,0.516793 -2.4135719,1.585761 -0.063562,1.024947 0.9093059,1.457499 1.5782589,1.457499 0,0 8.830403,-0.01705 8.830403,-0.01705 0.488364,-5.91e-4 0.922857,0.221532 1.080466,0.683755 0.15761,0.462231 0.0033,0.53156 -0.383664,0.829439 0,0 -15.9006939,12.205735 -15.9006939,12.205735 -0.00142,0.0014 -0.00284,0.0028 -0.00426,0.0043 -0.064038,0.04879 -0.084772,0.06226 -0.061795,0.04476 -0.5536756,0.424618 -0.8961097,0.98072 -1.0185711,1.476701 -0.1224537,0.495981 -0.04659,0.882548 0.1875202,1.182646 0.4788333,0.613413 1.8577618,0.820499 2.9863998,-0.09061 0,0 8.6727241,-7.09799 8.6727241,-7.09799 0.361955,-0.295752 0.77937,-0.340606 1.187723,-0.113169 0.408345,0.227437 0.548124,0.592694 0.487243,1.05613 0,0 -0.112502,0.980045 -0.10655,1.370159 0.192357,2.636407 1.448328,5.003383 3.115366,7.003128 2.877746,3.172809 6.937778,4.644674 11.130659,4.808308 4.20342,-0.04394 8.318367,-1.795011 11.174847,-4.89086 5.218918,-6.385867 3.809154,-13.408094 -1.879909,-18.037421 -4.496387,-3.658818 -9.213287,-7.0812097 -13.820947,-10.620357 -0.0043,-0.00352 -0.0086,-0.00707 -0.01279,-0.010651 -0.0072,-0.00489 -0.01427,-0.00987 -0.02131,-0.014921 C 26.575182,6.1532581 26.201079,6.0262199 25.796988,6.0267804 z"
id="path5342"
sodipodi:nodetypes="cssssscscczccsccssssccscccccscssc" />
<path
style="fill:url(#radialGradient9798);fill-rule:evenodd;stroke:none;fill-opacity:1"
id="path5344"
d="m 25.824987,24.903921 c 0.07942,-1.451637 0.788437,-2.733003 1.854283,-3.640163 1.048896,-0.891767 2.457385,-1.436271 3.995946,-1.436271 1.537581,0 2.946071,0.544504 3.994721,1.436271 1.067023,0.90716 1.775187,2.187565 1.855531,3.639202 0.08231,1.493972 -0.514893,2.88116 -1.561584,3.908574 -1.067024,1.046647 -2.588437,1.703695 -4.288668,1.703695 -1.70121,0 -3.222624,-0.657048 -4.289597,-1.703695 -1.047769,-1.027414 -1.642911,-2.414602 -1.560632,-3.907613 z"
inkscape:connector-curvature="0" />
<path
style="opacity:0.51999996;fill:url(#radialGradient6168);fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m 24.59375,7.1875 c 0,0 5.71875,4.65625 5.71875,4.65625 0.495581,0.404913 0.140487,1.262555 -0.78125,1.25 -5.634142,0.05114 -17.375,-0.03125 -17.375,-0.03125 -0.83333,0 -2.34375,0.577974 -2.34375,1.6875 0,1.109526 0.674797,1.256826 1.34375,1.25092 10e-7,0 8.8125,0 8.8125,0 1.45524,0.03051 1.617186,1.227393 0.6875,2.03033 0,0 -15.875,12.21875 -15.875,12.21875 -0.00142,0.0014 -0.029829,-0.0014 -0.03125,0 -0.064037,0.04879 -0.054226,0.04875 -0.03125,0.03125 -0.5536758,0.424619 -0.9087886,1.004019 -1.03125,1.5 -0.1224536,0.495981 -0.04661,0.856152 0.1875,1.15625 0.4788333,0.613413 1.7334178,0.312915 2.8620558,-0.598192 10e-8,10e-7 8.5678612,-7.049556 8.5678612,-7.049556 0.825495,-0.683682 2.569434,-0.118316 2.418275,1.384804 -0.225591,2.243266 0.09704,3.321215 0.922097,5.052178 2.275388,4.773775 9.8328,-12.333881 26.249318,-10.695484 -0.847848,-1.48757 -2.036218,-3.155316 -3.53125,-4.371859 C 36.866972,13.000573 27.607995,6.1227791 27.607995,6.1227791 26.244584,5.10849 23.323901,5.9514388 24.59375,7.1875 z"
id="path5346"
sodipodi:nodetypes="cccczscccssssscsscsss" />
<path
clip-path="url(#clipPath6085)"
sodipodi:nodetypes="csssssssssscccsscccscccssccc"
d="m 16.048489,28.093447 c 0.0098,0.576682 0.196474,1.697902 0.471116,2.577425 0.581566,1.854137 1.56684,3.572658 2.939126,5.086496 1.407488,1.553118 3.138519,2.803227 5.139315,3.68976 2.105357,0.931573 4.384795,1.407488 6.750134,1.403741 2.365339,-0.005 4.644601,-0.488686 6.74896,-1.427017 2.00002,-0.895288 3.731043,-2.148391 5.13754,-3.705517 1.369207,-1.519844 2.352576,-3.241114 2.934089,-5.096258 0.294262,-0.938353 0.476921,-1.889392 0.553238,-2.845308 0.07331,-0.939306 0.04204,-1.883511 -0.09183,-2.823792 -0.259981,-1.835599 -0.896294,-3.556847 -1.872652,-5.12758 -0.895541,-1.441699 -2.047808,-2.70454 -3.417268,-3.766975 0,0 0.002,-0.002 0.002,-0.002 0,0 -13.828458,-10.6197195 -13.828458,-10.6197195 -0.01176,-0.00978 -0.02252,-0.019551 -0.03529,-0.028344 -0.909003,-0.6959264 -2.434775,-0.6939758 -3.431728,0.00488 -1.01067,0.7057021 -1.091821,1.8092613 -0.195527,2.5482146 1.899775,1.4997633 3.792068,3.0680401 5.702368,4.5676191 0,0 -17.551681,-0.01171 -17.551681,-0.01171 -1.994685,0 -3.1682604,0.947915 -3.4153942,2.333683 -0.2180771,1.222836 0.7479213,2.738129 2.4800212,2.738129 2.956573,0.0039 5.942111,-0.0069 8.909215,-0.01272 0,0 -15.901723,11.764162 -15.901723,11.764162 -0.020527,0.01564 -0.041053,0.02933 -0.06158,0.04497 -1.4974197,1.148389 -1.9831951,3.059322 -1.0399808,4.268393 0.9598323,1.22959 2.9977653,1.230588 4.5147288,0.006 0,0 8.6775931,-7.102098 8.6775931,-7.102098 0,0 -0.12511,0.959824 -0.116333,1.535532 z"
id="path6081"
style="opacity:0.69791667;fill:none;stroke:#954900;stroke-width:0.73023587;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5467)" />
<path
transform="translate(-0.1038151,0.1038151)"
d="m 25.78125,5.3125 c -0.53584,7.387e-4 -1.084766,0.146423 -1.5,0.4375 -0.421409,0.2942497 -0.602942,0.6572658 -0.625,0.96875 -0.02206,0.3114842 0.107704,0.6085842 0.46875,0.90625 1.903914,1.5030311 3.813217,3.066663 5.71875,4.5625 a 0.43281463,0.43281463 0 0 1 -0.28125,0.78125 l -17.5625,0 c -0.930321,0 -1.612381,0.221355 -2.09375,0.5625 -0.4813693,0.341145 -0.7691312,0.781356 -0.875,1.375 -0.1688145,0.946603 0.5535284,2.25 2.03125,2.25 2.953338,0.0039 5.936874,-0.02539 8.90625,-0.03125 a 0.43281463,0.43281463 0 0 1 0.25,0.78125 L 4.3125,29.6875 c -0.034092,0.02598 -0.03665,0.01897 -0.0625,0.03125 -1.347439,1.033367 -1.7002474,2.678513 -0.9375,3.65625 0.7751666,0.993025 2.5374375,1.042487 3.90625,-0.0625 L 15.875,26.21875 a 0.43281463,0.43281463 0 0 1 0.71875,0.375 c 0,0 -0.101633,0.982953 -0.09375,1.5 0.0084,0.493889 0.177213,1.603948 0.4375,2.4375 0.562811,1.794343 1.51227,3.468677 2.84375,4.9375 1.36736,1.508838 3.052893,2.699756 5,3.5625 2.049801,0.906991 4.255957,1.378654 6.5625,1.375 2.309464,-0.0049 4.515994,-0.462465 6.5625,-1.375 1.947032,-0.871568 3.666193,-2.082502 5.03125,-3.59375 1.327624,-1.473686 2.24864,-3.138671 2.8125,-4.9375 0.285397,-0.910084 0.457704,-1.828798 0.53125,-2.75 0.07074,-0.906296 0.0357,-1.840704 -0.09375,-2.75 -0.251441,-1.7753 -0.866193,-3.446363 -1.8125,-4.96875 -0.86755,-1.396638 -1.949249,-2.591626 -3.28125,-3.625 L 27.25,5.78125 a 0.43281463,0.43281463 0 0 1 -0.03125,0 c -0.09093,-0.075558 -0.08886,-0.092466 0,-0.03125 -0.363805,-0.2785273 -0.903938,-0.4382356 -1.4375,-0.4375 z"
inkscape:href="#path5338"
id="path6113"
style="opacity:0.43678164;fill:none;stroke:url(#radialGradient6121);stroke-width:0.18255897;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter6127)"
xlink:href="#path5338"
inkscape:original="M 25.78125 4.875 C 25.161562 4.8758538 24.529727 5.0568221 24.03125 5.40625 C 23.02058 6.1119521 22.947456 7.2297967 23.84375 7.96875 C 25.743525 9.4685133 27.6522 11.031671 29.5625 12.53125 L 12 12.53125 C 10.005315 12.53125 8.8408838 13.457982 8.59375 14.84375 C 8.3756729 16.066586 9.3304001 17.59375 11.0625 17.59375 C 14.019073 17.59765 17.001646 17.56832 19.96875 17.5625 L 4.0625 29.34375 C 4.041973 29.35939 4.020527 29.35936 4 29.375 C 2.5025803 30.523389 2.0255357 32.447179 2.96875 33.65625 C 3.9285823 34.88584 5.9830365 34.880838 7.5 33.65625 L 16.15625 26.5625 C 16.15625 26.5625 16.053723 27.518042 16.0625 28.09375 C 16.0723 28.670432 16.256608 29.776727 16.53125 30.65625 C 17.112816 32.510387 18.096464 34.236162 19.46875 35.75 C 20.876238 37.303118 22.592954 38.550967 24.59375 39.4375 C 26.699107 40.369073 28.978411 40.847497 31.34375 40.84375 C 33.709089 40.83875 35.989391 40.375831 38.09375 39.4375 C 40.09377 38.542212 41.843503 37.275876 43.25 35.71875 C 44.619207 34.198906 45.574737 32.480144 46.15625 30.625 C 46.450512 29.686647 46.642433 28.737166 46.71875 27.78125 C 46.79206 26.841944 46.75887 25.877781 46.625 24.9375 C 46.365019 23.101901 45.726358 21.383233 44.75 19.8125 C 43.854459 18.370801 42.71321 17.124935 41.34375 16.0625 L 27.5 5.4375 C 27.48824 5.42772 27.48152 5.415043 27.46875 5.40625 C 27.014249 5.0582868 26.400938 4.8741462 25.78125 4.875 z "
inkscape:radius="-0.43277135"
sodipodi:type="inkscape:offset" />
<path
id="path6151"
transform="matrix(0.1857898,0,0,0.1857898,-2.4225986,-1.6310883)"
d="m 153.40625,38.03125 c -5.56523,0.01098 -10.69216,2.532873 -9.5,6.0625 1.49885,-4.120535 12.31419,-5.870121 18.0625,-1.59375 0,0 50.71398,37.676904 75.34375,57.71875 7.49621,6.09984 13.55477,14.25472 18.09375,21.84375 0.41707,0.0374 0.83082,0.0519 1.25,0.0937 C 252.012,114.00782 245.50181,104.88259 237.3125,98.21875 212.68273,78.176911 161.96875,40.5 161.96875,40.5 c -2.33385,-1.736235 -5.52342,-2.474747 -8.5625,-2.46875 z m 24.4375,37.34375 c -0.52291,1.766542 -2.397,3.352638 -5.34375,3.3125 -30.86204,0.280116 -95.1875,-0.15625 -95.1875,-0.15625 -4.564714,-10e-7 -12.84375,3.141119 -12.84375,9.21875 0,0.379852 0.03453,0.753994 0.0625,1.09375 0.781053,-5.477136 8.452586,-8.3125 12.78125,-8.3125 0,0 64.32546,0.436359 95.1875,0.15625 4.0631,0.05534 6.11164,-2.970588 5.34375,-5.3125 z m -50.90625,25.46875 c -0.30408,1.66026 -1.32885,3.40896 -3.0625,4.90625 0,0 -86.96875,66.90625 -86.96875,66.90625 -0.0078,0.008 -0.148468,-0.008 -0.15625,0 -0.350777,0.26728 -0.313357,0.28336 -0.1875,0.1875 -3.032861,2.32594 -4.954195,5.50192 -5.625,8.21875 -0.306372,1.24091 -0.375948,2.3112 -0.25,3.28125 0.05246,-0.4134 0.138206,-0.82845 0.25,-1.28125 0.670805,-2.71683 2.592139,-5.89281 5.625,-8.21875 -0.125857,0.0959 -0.163277,0.0798 0.1875,-0.1875 0.0078,-0.008 0.148469,0.008 0.15625,0 0,0 86.96875,-66.90625 86.96875,-66.90625 2.45227,-2.11794 3.50673,-4.74191 3.0625,-6.90625 z m -19.125,52.34375 c -0.30179,3.03149 -0.43687,5.65829 -0.375,8.0625 0.026,-1.8868 0.1482,-3.90098 0.375,-6.15625 0.067,-0.66645 0.0608,-1.30801 0,-1.90625 z"
style="fill:url(#radialGradient6166);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter6156)" />
<path
sodipodi:nodetypes="ccc"
transform="matrix(0.182559,0,0,0.182559,-1.95853,-1.2718719)"
id="path5455"
d="m 29.75,176 c -2.614996,11.18132 0.641128,17.71466 14,16.25 -9.13081,-1.29592 -13.534207,-6.9556 -14,-16.25 z"
style="opacity:0.54819282;fill:url(#radialGradient5463);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5489)" />
</g>
</g>
<g
transform="matrix(0.9907499,0,0,0.9907499,303.07254,116.07051)"
inkscape:label="Layer 1"
id="g5430">
<path
sodipodi:type="arc"
style="opacity:0.54857142;fill:url(#radialGradient5444);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path5432"
sodipodi:cx="28.019106"
sodipodi:cy="38.98439"
sodipodi:rx="15.467961"
sodipodi:ry="5.3033009"
d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
transform="matrix(0.855157,0,0,0.922661,-5.661873,-11.9649)" />
<path
style="fill:#f57900;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1.00933623;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
id="path5434"
d="m 10.187586,18.047598 c 0.0066,0.386372 0.131851,1.137579 0.316159,1.726852 0.390282,1.242256 1.051486,2.393649 1.972408,3.407908 0.944546,1.040575 2.106217,1.878137 3.448923,2.472106 1.412877,0.624146 2.942576,0.943005 4.529923,0.940494 1.587347,-0.0034 3.116928,-0.327415 4.529134,-0.956089 1.342186,-0.599834 2.503852,-1.439402 3.447733,-2.482663 0.918857,-1.018282 1.578781,-2.171518 1.969027,-3.414447 0.197475,-0.628689 0.320055,-1.265877 0.37127,-1.906332 0.0492,-0.629327 0.02821,-1.261936 -0.06162,-1.891916 -0.174469,-1.229834 -0.60149,-2.383056 -1.256711,-3.435433 -0.600985,-0.965926 -1.374255,-1.812018 -2.293281,-2.5238405 0,0 0.0013,-0.00133 0.0013,-0.00133 0,0 -9.280088,-7.1151179 -9.280088,-7.1151179 -0.0079,-0.00655 -0.01511,-0.013099 -0.02368,-0.01899 -0.610019,-0.4662646 -1.633945,-0.6859286 -2.302986,-0.2176987 -0.678247,0.4728142 -0.732706,1.4331601 -0.131215,1.9282522 1.274912,1.0048282 2.456416,1.9671715 3.738393,2.9718762 0,0 -12.7509646,0.014254 -12.7509646,0.014254 -1.3386056,0 -1.914871,1.0224026 -1.9384708,1.9833918 -0.02305,0.9386102 0.7891825,2.0702192 1.9515704,2.0711752 0,0 3.965571,0.0175 5.956754,0.01358 -3.4235028,2.47543 -6.8475413,5.076299 -10.2708111,7.552044 -1.0048978,0.769411 -1.14339496,2.049719 -0.5104168,2.859786 0.6441302,0.823814 1.8242592,0.824483 2.8422726,0.004 0,0 5.8234133,-5.010677 5.8234133,-5.010677 0,0 -0.08396,0.643074 -0.07807,1.028793 z"
sodipodi:nodetypes="csssssssssscccssccczsccsccc" />
<path
sodipodi:type="arc"
style="fill:url(#linearGradient5446);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path5436"
sodipodi:cx="31.1875"
sodipodi:cy="25.75"
sodipodi:rx="11.5625"
sodipodi:ry="10.125"
d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
transform="matrix(0.551379,0,0,0.562462,3.360761,1.826627)" />
<path
style="opacity:0.4857143;fill:none;stroke:url(#linearGradient5448);stroke-width:1.00933504;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 16.183788,3.9296777 c 0,0 5.841301,4.5669819 5.841301,4.5669819 0,0 -15.0860461,0.044876 -15.0860461,0.044876 -0.6224845,-0.00994 -1.3825975,0.1034157 -1.4062455,0.9246436 -0.025438,0.8833949 0.7343979,0.9913899 1.2651077,0.9986569 0,0 8.5494479,0.05356 8.5494479,0.05356 0,0 -12.267489,8.74809 -12.267489,8.74809 -1.605644,1.202274 -1.1006151,2.791545 0.8108018,1.702087 0,0 7.4517972,-5.968473 7.4517972,-5.968473 -0.285869,2.351972 -0.387804,4.925306 1.645322,7.280497 1.825159,2.11428 4.424594,3.170021 7.161605,3.322252 2.746147,0.01701 5.453371,-0.928662 7.352804,-2.916071 3.478266,-4.106778 2.808095,-8.758593 -0.85778,-11.83863 -2.897349,-2.4343285 -6.060137,-4.77752 -9.089408,-7.0523203 -0.87112,-0.6541592 -1.8742,-0.359145 -1.371218,0.133852 z"
id="path5438"
sodipodi:nodetypes="ccczcccscsccsss" />
<path
style="fill:#0d528b;fill-rule:evenodd;stroke:none;opacity:1"
id="path5440"
d="m 16.870671,15.810225 c 0.04997,-0.911963 0.49613,-1.716956 1.166823,-2.286861 0.660025,-0.560235 1.546327,-0.902308 2.514478,-0.902308 0.967535,0 1.853838,0.342073 2.51371,0.902308 0.671432,0.569905 1.11705,1.374294 1.167606,2.286258 0.05179,0.938558 -0.323999,1.810031 -0.982639,2.455482 -0.671432,0.657536 -1.628794,1.070313 -2.698677,1.070313 -1.070498,0 -2.027861,-0.412777 -2.699262,-1.070313 -0.659317,-0.645451 -1.033814,-1.516924 -0.982039,-2.454879 z" />
<path
style="opacity:0.51999996;fill:url(#radialGradient5450);fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m 15.941783,4.3847816 c 1.218441,0.9640174 3.50563,2.730562 4.713027,3.7120538 0,0 -11.580862,-0.019972 -14.4894503,-0.022335 -0.5984048,4e-4 -1.1019407,0.4637065 -1.1000164,1.3968904 0.00192,0.9331843 0.7369658,1.6018793 1.1570273,1.6018793 0,0 7.6693824,0.02524 7.6693824,0.02524 0,0 -10.8035198,7.912497 -10.8035198,7.912497 -1.9819419,1.644102 -0.070483,3.132672 1.7755004,1.771457 1e-7,0 5.9980934,-4.790917 5.9980934,-4.790917 0,0 -0.59069,2.16135 0.282449,4.098577 1.355348,3.0071 7.649453,-8.255022 17.958019,-7.22789 -0.532397,-0.932577 -1.389106,-1.894653 -2.327894,-2.65732 0,0 -5.954377,-4.5306028 -8.847705,-6.749341 -1.770054,-1.2855307 -3.104625,-0.097655 -1.984913,0.9292116 z"
id="path5442"
sodipodi:nodetypes="ccczcccccscscc" />
</g>
<image
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAMdEVY dFRpdGxlAEZvbGRlcuNZL58AAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVpbmVy5vv3LwAAACF0RVh0 U291cmNlAGh0dHA6Ly9qaW1tYWMubXVzaWNoYWxsLmN6aWbjXgAAAFJ0RVh0Q29weXJpZ2h0AEND IEF0dHJpYnV0aW9uLVNoYXJlQWxpa2UgaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5z ZXMvYnktc2EvMy4wL16DWrwAAAKLSURBVDiNpZNdSFNxGMaf//9/Nne2+TF1psNczc0RrSxBI+8s axp+hBClgdpFsYu6iKiE7vtQr4TAa8WwujEFhykIZWBRMqELJ87cLkSbbH5tx23nnH9XCQtBquf2 efnB+7zPS9xuN/5HwmED3bavY+C8SqWiuyvg8v3p08MABLhUfO5ygUYnvO2x+Wr/GqDKKahbqxHb +Vo70xte95SlQ8jvDHotE9UKNQylmVp9CU/GQ1SOhW31typJhgFL3sEQYVrPw+UKbxqg2zorO+tb GQgDoRQgDIqcAtPqAHCAMPDkDpJ7ydSSdxCEkmtdqzXvmN1uBwA0F646N4IBx8+FOQqqjYr5RaLG VAzmaoFwth3UVgNqdoKEPjC9uTi5GVxsu5i7OrKfwV1/1c2UzDugKGqe41QOJQB1uDG+bETlnSE0 PhnD+KIG2voeiNKKaLZat7EXe7QPeHH8WwOS8YGyxk7CxCyKWBik4AT6R+cBAOuROPpH58HFfPBs K0yZMAFoEgCg1zxRrfKcEWdDO4tHwxLZjAoii2vAD7oLh6LJggAFhFAj7bNMXOdG00dn3Q3m975S V6aGE6nY5jakKBLBL/A0lQMAjuTq4Wkqh7QTBf0xCa4xAIBEfLczJWddq27x/RsFqvogKcUqjHnm CqvV5OIbC0DHFPRlF6DIMuLrS+DDLRC2lhEVSmPhgH+a+Dz5A5ATV0GFK4+DVTNPj86cJglpMqvU lWExxLJ5JJC+gUYPyXRGDs3NKvKeeowc9EzPLdPNXJb7kF2oK3HY8gwZnIGrSCkU62uR3a2gn3xf U9s6JzF2IAAAntk/W7G7ey+ZUtu0DEWcQ1E4onGZjL/8pNzfPumOpDXxX/ULcc4GQ2/jH+UAAAAA SUVORK5CYII= "
width="16"
height="16"
id="image19710"
x="303"
y="209" />
<image
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAMdEVY dFRpdGxlAEZvbGRlcuNZL58AAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVpbmVy5vv3LwAAACF0RVh0 U291cmNlAGh0dHA6Ly9qaW1tYWMubXVzaWNoYWxsLmN6aWbjXgAAAFJ0RVh0Q29weXJpZ2h0AEND IEF0dHJpYnV0aW9uLVNoYXJlQWxpa2UgaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5z ZXMvYnktc2EvMy4wL16DWrwAAASJSURBVDiNtZVbbFRFGMd/M+fsfbfb1m4vtiBgBekF05CoQDAQ jKuiAYwPBhT0AYJGTYAgEiW8iYAPhgeRBx8kkUuUqglKNsECcqsoEMOl9AaBtlt6YUu72+7u2XPO +NBDLSQgL37JZE6+zPy+/3wz33dENBrl/zD9YRZ9WdO0KpdMrldCTFRW7i93KLR5zeXaww/aIx5G 8c7ZV1Vo3gZ8Ph07nbKu7d7Q4coLr3wQXKusrPxP8HzzjJvBprl5Jfm40nEZnrUi3Hd8/0vzQ21/ N6Qq2++r+LNIbLPL7V6uB0KlUuogJCBASgTSD6CEwF9SRGHVbKVrUohIHc273h+yUqmNHyeiX90P 3Fvz6cEIKMctx63491P2nEMphW3llNQ9gvxptH7zoSVs8eKalrvTMnp5ij4hRJG6/J1ASITmBd0L mhehexyqB+RoQCmlwByGnkamvvu1dnHLkgNbiuKvbeyP/nZXjhcE2tODZ36s629rCSba2+y+pguM 9PbkCuat1iwjjQyVgQJROhNZ8QwyUoPwRlDJDui9SPHcJZ7+c0dfeN7XevrwSGXHWCrG2/YJp1Yp wa6qdXtQvRcQUoIriKxdhvTlk0hmyBomkXw/msphnd2F1XUcAmGaf/q5U7j9i9c3Tz+r3w9qxc8i 7TQKG1G9FMsV5Nj5Dq7dTJLK5EgMZVn9ynSKapdjt8dQgwnyIgUVyaH0NmDBGHhr+ckPlBA7qtbt QcVPI4UHzBGUvxTbV0xnzxCXb9zmzKUuWjsHyJk2AZfivUU1CG8FdDcQ9lqkBsW0scvbWhJ7Gsu1 reqjetTVQ2RzuqnEsPSQksovME0Tw8hRf+QKQyPG2Alt28IwDHQ9iHarDU/hFIAQgPyiJLZZeoIn qjfWe+2WeloP7rNav99h29mkjZWFgSsYI4OE3CY1k/LHoBVFfhbNqsAwDOhsBCEYVmGA5Khib3DT 9LV7Nav5B1oOHsiRTW0CirN9N1b4ysseofN37ENrMZ/7nDWLn+D1OeUYpmJyaRBdAy7uR+s8hQhE 6L+ZMIE4gAwURqTVe5HWX+qTIp1aOGM32wcyNHX9ccRURhqr6zq+K/sJxVZB7yVK811MLHIjUnG8 jVsJNqwdraNH6zAzIznbUkcBxLk36QUCWZPqWfvoATKA2LuQnTMmR96a8lS1z752DNRoVSpPGFu6 0TL9Yz752ByuXmo1MlmzUSHf+OT6zG4RjUaJxWIS0Jxa1gAvENyzkF+rJhRMmzpnvk73edTt66Bs p9QFIq8cUTaTtj9PmcPDRlfCDix7+dv46Wg0agunG3gBl/NKNKAQyAdmrKxl6ds18tm8SImr5PEn NV0TeMMFpAZuk4jfMIf7e4kPy7ZX9w68A3QA/YAhHJU+55mY4+BlQBioWlbjrZ43yVNXyGB5oZew FJBTIpcR/uTJbnloy4lkA9DpgPuA7B3FLsDjBBEO2O0E9AMTnFPdaXsWkHPmLJBygLeANGDh9Io7 MO0euO4EzAMKnFEEFAMlzlwIBB1xAqf/PNSvabzFYjFxry8ajap7ff8Agrza9zbhZ90AAAAASUVO RK5CYII= "
width="22"
height="22"
id="image19724"
x="303"
y="167" />
<g
id="g9782">
<path
inkscape:connector-curvature="0"
d="m 491.24978,63.587162 c 0.0868,-1.562276 0.85304,-2.940366 2.0071,-3.917191 l 0,0 c 1.13397,-0.959657 2.65807,-1.545263 4.32238,-1.545368 l 0,0 c 1.66352,1.05e-4 3.18763,0.585711 4.32164,1.545368 l 0,0 c 1.15441,0.976825 1.92058,2.354729 2.0083,3.916662 0.0883,1.607195 -0.5568,3.100488 -1.69002,4.206112 l 0,0 c -1.15468,1.126218 -2.79964,1.833283 -4.63965,1.833283 l 0,0 c -1.84055,0 -3.48657,-0.707065 -4.6413,-1.833283 l 0,0 c -1.13316,-1.1052 -1.77768,-2.598705 -1.68845,-4.205583"
style="fill:#0d528b;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path9266" />
<path
inkscape:connector-curvature="0"
d="m 481.16722,66.750592 c 0.0104,0.610255 0.20736,1.79817 0.49919,2.729465 l 0,0 c 0.61545,1.964124 1.65874,3.783545 3.11239,5.387111 l 0,0 c 1.49072,1.645175 3.32369,2.969218 5.44354,3.907954 l 0,0 c 2.22956,0.986777 4.64394,1.49145 7.14888,1.48679 l 0,0 c 2.50548,-0.0047 4.91952,-0.5173 7.14831,-1.511426 l 0,0 c 2.11802,-0.947748 3.95115,-2.274901 5.44081,-3.925057 l 0,0 c 1.4507,-1.60945 2.49248,-3.431761 3.10865,-5.397552 l 0,0 c 0.31113,-0.993921 0.50512,-2.000669 0.58489,-3.012691 l 0,0 c 0.0777,-0.995696 0.0445,-1.994889 -0.0967,-2.99138 l 0,0 c -0.27562,-1.943638 -0.94876,-3.766981 -1.98312,-5.430282 -0.94903,-1.527057 -2.16917,-2.864253 -3.61988,-3.990365 l 0,0 0.002,-0.0019 0,0 -14.64557,-11.247437 0,0 c -0.0127,-0.01007 -0.0246,-0.0204 -0.0374,-0.03021 l 0,0 c -0.96328,-0.736748 -2.57907,-0.734363 -3.635,0.0053 l 0,0 c -1.06998,0.747614 -1.18998,1.982859 -0.24037,2.76466 l 0,0 -0.003,0.0024 0,0 6.10894,4.968542 -18.62178,0.01988 0,0 c -0.009,0 -0.0169,-2.54e-4 -0.0254,-2.54e-4 l 0,0 c -1.53866,7.81e-4 -3.01717,1.012631 -3.31158,2.287629 l 0,0 c -0.29846,1.300517 0.747,2.378713 2.34591,2.384837 l 0,0 -8.7e-4,0.0054 0,0 9.43718,-0.01812 -16.84256,12.927248 0,0 c -0.0213,0.01624 -0.0435,0.03159 -0.0647,0.04813 l 0,0 c -1.58657,1.216401 -2.10109,3.240153 -1.10147,4.520744 l 0,0 c 1.01669,1.302506 3.17515,1.303326 4.78149,0.0059 l 0,0 9.19101,-7.5214 c 0,0 -0.13322,1.015864 -0.12318,1.626223 z m 23.61918,3.398421 c -1.89407,1.931845 -4.54345,3.025253 -7.41438,3.02989 l 0,0 c -2.87226,0.0059 -5.52304,-1.079204 -7.41741,-3.005774 l 0,0 c -0.92589,-0.939669 -1.60603,-2.017734 -2.02563,-3.169949 l 0,0 c -0.41078,-1.130245 -0.5704,-2.328628 -0.46553,-3.539224 l 0,0 c 0.10249,-1.18492 0.4522,-2.312381 1.01629,-3.334659 l 0,0 c 0.5529,-1.003965 1.3139,-1.910907 2.25336,-2.678847 l 0,0 c 1.84095,-1.501268 4.18327,-2.31238 6.63653,-2.315588 l 0,0 c 2.45327,-0.0035 4.79576,0.801359 6.63656,2.296745 l 0,0 c 0.9387,0.76378 1.69904,1.667754 2.25239,2.669942 l 0,0 c 0.56369,1.020529 0.91378,2.146534 1.01687,3.331769 l 0,0 c 0.10468,1.209461 -0.0549,2.408769 -0.46563,3.539942 l 0,0 c -0.41926,1.152825 -1.09877,2.232769 -2.02342,3.175753"
style="fill:#f5792a;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path9268" />
</g>
<g
id="g9786"
transform="matrix(5.2091874,0,0,5.2091874,-2775.9222,-186.77589)">
<path
id="path9788"
style="fill:#0d528b;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 491.24978,63.587162 c 0.0868,-1.562276 0.85304,-2.940366 2.0071,-3.917191 l 0,0 c 1.13397,-0.959657 2.65807,-1.545263 4.32238,-1.545368 l 0,0 c 1.66352,1.05e-4 3.18763,0.585711 4.32164,1.545368 l 0,0 c 1.15441,0.976825 1.92058,2.354729 2.0083,3.916662 0.0883,1.607195 -0.5568,3.100488 -1.69002,4.206112 l 0,0 c -1.15468,1.126218 -2.79964,1.833283 -4.63965,1.833283 l 0,0 c -1.84055,0 -3.48657,-0.707065 -4.6413,-1.833283 l 0,0 c -1.13316,-1.1052 -1.77768,-2.598705 -1.68845,-4.205583"
inkscape:connector-curvature="0" />
<path
id="path9790"
style="fill:#f5792a;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 481.16722,66.750592 c 0.0104,0.610255 0.20736,1.79817 0.49919,2.729465 l 0,0 c 0.61545,1.964124 1.65874,3.783545 3.11239,5.387111 l 0,0 c 1.49072,1.645175 3.32369,2.969218 5.44354,3.907954 l 0,0 c 2.22956,0.986777 4.64394,1.49145 7.14888,1.48679 l 0,0 c 2.50548,-0.0047 4.91952,-0.5173 7.14831,-1.511426 l 0,0 c 2.11802,-0.947748 3.95115,-2.274901 5.44081,-3.925057 l 0,0 c 1.4507,-1.60945 2.49248,-3.431761 3.10865,-5.397552 l 0,0 c 0.31113,-0.993921 0.50512,-2.000669 0.58489,-3.012691 l 0,0 c 0.0777,-0.995696 0.0445,-1.994889 -0.0967,-2.99138 l 0,0 c -0.27562,-1.943638 -0.94876,-3.766981 -1.98312,-5.430282 -0.94903,-1.527057 -2.16917,-2.864253 -3.61988,-3.990365 l 0,0 0.002,-0.0019 0,0 -14.64557,-11.247437 0,0 c -0.0127,-0.01007 -0.0246,-0.0204 -0.0374,-0.03021 l 0,0 c -0.96328,-0.736748 -2.57907,-0.734363 -3.635,0.0053 l 0,0 c -1.06998,0.747614 -1.18998,1.982859 -0.24037,2.76466 l 0,0 -0.003,0.0024 0,0 6.10894,4.968542 -18.62178,0.01988 0,0 c -0.009,0 -0.0169,-2.54e-4 -0.0254,-2.54e-4 l 0,0 c -1.53866,7.81e-4 -3.01717,1.012631 -3.31158,2.287629 l 0,0 c -0.29846,1.300517 0.747,2.378713 2.34591,2.384837 l 0,0 -8.7e-4,0.0054 0,0 9.43718,-0.01812 -16.84256,12.927248 0,0 c -0.0213,0.01624 -0.0435,0.03159 -0.0647,0.04813 l 0,0 c -1.58657,1.216401 -2.10109,3.240153 -1.10147,4.520744 l 0,0 c 1.01669,1.302506 3.17515,1.303326 4.78149,0.0059 l 0,0 9.19101,-7.5214 c 0,0 -0.13322,1.015864 -0.12318,1.626223 z m 23.61918,3.398421 c -1.89407,1.931845 -4.54345,3.025253 -7.41438,3.02989 l 0,0 c -2.87226,0.0059 -5.52304,-1.079204 -7.41741,-3.005774 l 0,0 c -0.92589,-0.939669 -1.60603,-2.017734 -2.02563,-3.169949 l 0,0 c -0.41078,-1.130245 -0.5704,-2.328628 -0.46553,-3.539224 l 0,0 c 0.10249,-1.18492 0.4522,-2.312381 1.01629,-3.334659 l 0,0 c 0.5529,-1.003965 1.3139,-1.910907 2.25336,-2.678847 l 0,0 c 1.84095,-1.501268 4.18327,-2.31238 6.63653,-2.315588 l 0,0 c 2.45327,-0.0035 4.79576,0.801359 6.63656,2.296745 l 0,0 c 0.9387,0.76378 1.69904,1.667754 2.25239,2.669942 l 0,0 c 0.56369,1.020529 0.91378,2.146534 1.01687,3.331769 l 0,0 c 0.10468,1.209461 -0.0549,2.408769 -0.46563,3.539942 l 0,0 c -0.41926,1.152825 -1.09877,2.232769 -2.02342,3.175753"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 59 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -41,7 +41,7 @@ char name[24]= "Blur";
VarStruct varstr[]= { VarStruct varstr[]= {
LABEL, "Input: 1 strip", 0.0, 0.0, 0.0, "", LABEL, "Input: 1 strip", 0.0, 0.0, 0.0, "",
NUMSLI|FLO, "Blur", 0.5, 0.0, 10.0, "Maximum filtersize", NUMSLI|FLO, "Blur", 0.5, 0.0, 10.0, "Maximum filtersize",
NUMSLI|FLO, "Gamma", 1.0, 0.4, 2.0, "Gamma correction", NUMSLI|FLO, "Gamma", 1.0, 0.4, 2.0, "Gamma correction",
TOG|INT, "Animated", 0.0, 0.0, 1.0, "For (Ipo) animated blur", TOG|INT, "Animated", 0.0, 0.0, 1.0, "For (Ipo) animated blur",
NUM|INT, "debug", 0.0, 0.0, 2.0, NUM|INT, "debug", 0.0, 0.0, 2.0,

View File

@@ -196,7 +196,7 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int width,
src1f= ibuf1->rect_float; src1f= ibuf1->rect_float;
for (y = 0; y < 256; y++) { for (y = 0; y < 256; y++) {
float v = 1.0 * y / 255; float v = 1.0 * y / 255;
v += cast->setup_y; v += cast->setup_y;
v *= cast->gain_y; v *= cast->gain_y;
v = pow(v, cast->gamma_y); v = pow(v, cast->gamma_y);

View File

@@ -129,7 +129,7 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int width,
src1f= ibuf1->rect_float; src1f= ibuf1->rect_float;
for (y = 0; y < 256; y++) { for (y = 0; y < 256; y++) {
float v = 1.0 * y / 255; float v = 1.0 * y / 255;
v += cast->setup_y; v += cast->setup_y;
v *= cast->gain_y; v *= cast->gain_y;
v = pow(v, cast->gamma_y); v = pow(v, cast->gamma_y);

View File

@@ -66,7 +66,7 @@ static void precalculate(unsigned char * table, int level)
} }
*table++ = ap; *table++ = ap;
} }
} }
} }

View File

@@ -85,7 +85,7 @@ static void make_gamma_table(float setup, float gain, float gamma,
int y; int y;
for (y = 0; y < 256; y++) { for (y = 0; y < 256; y++) {
float v = 1.0 * y / 255; float v = 1.0 * y / 255;
v += setup; v += setup;
v *= gain; v *= gain;
v = pow(v, gamma); v = pow(v, gamma);

View File

@@ -193,9 +193,9 @@ static void fill_out(ImBuf *out, float r, float g, float b, float a)
} else { } else {
for (x=0;x < tot;x++) { for (x=0;x < tot;x++) {
rect[0] = (int)(r * 255); rect[0] = (int)(r * 255);
rect[1] = (int)(g * 255); rect[1] = (int)(g * 255);
rect[2] = (int)(b * 255); rect[2] = (int)(b * 255);
rect[3] = (int)(a * 255); rect[3] = (int)(a * 255);
rect += 4; rect += 4;
} }
} }

View File

@@ -689,7 +689,7 @@ import bpy
class UpdateAnimData(bpy.types.Operator): class UpdateAnimData(bpy.types.Operator):
'''Update data paths from 2.53 to edited data paths of drivers and fcurves''' """Update data paths from 2.56 and previous versions, modifying data paths of drivers and fcurves"""
bl_idname = "anim.update_data_paths" bl_idname = "anim.update_data_paths"
bl_label = "Update Animation Data" bl_label = "Update Animation Data"

View File

@@ -55,7 +55,7 @@ class MakeFur(bpy.types.Operator):
mat.strand.blend_distance = 0.5 mat.strand.blend_distance = 0.5
for obj in mesh_objects: for obj in mesh_objects:
fake_context["active_object"] = obj fake_context["object"] = obj
bpy.ops.object.particle_system_add(fake_context) bpy.ops.object.particle_system_add(fake_context)
psys = obj.particle_systems[-1] psys = obj.particle_systems[-1]
@@ -110,6 +110,7 @@ class MakeSmoke(bpy.types.Operator):
default=False) default=False)
def execute(self, context): def execute(self, context):
fake_context = bpy.context.copy()
mesh_objects = [obj for obj in context.selected_objects if obj.type == 'MESH'] mesh_objects = [obj for obj in context.selected_objects if obj.type == 'MESH']
min_co = Vector((100000, 100000, 100000)) min_co = Vector((100000, 100000, 100000))
max_co = Vector((-100000, -100000, -100000)) max_co = Vector((-100000, -100000, -100000))
@@ -119,8 +120,9 @@ class MakeSmoke(bpy.types.Operator):
return {'CANCELLED'} return {'CANCELLED'}
for obj in mesh_objects: for obj in mesh_objects:
fake_context["object"] = obj
# make each selected object a smoke flow # make each selected object a smoke flow
bpy.ops.object.modifier_add({"object": obj}, type='SMOKE') bpy.ops.object.modifier_add(fake_context, type='SMOKE')
obj.modifiers[-1].smoke_type = 'FLOW' obj.modifiers[-1].smoke_type = 'FLOW'
psys = obj.particle_systems[-1] psys = obj.particle_systems[-1]
@@ -153,7 +155,7 @@ class MakeSmoke(bpy.types.Operator):
obj.scale = 0.5 * (max_co - min_co) + Vector((1.0, 1.0, 2.0)) obj.scale = 0.5 * (max_co - min_co) + Vector((1.0, 1.0, 2.0))
# setup smoke domain # setup smoke domain
bpy.ops.object.modifier_add({"object": obj}, type='SMOKE') bpy.ops.object.modifier_add(type='SMOKE')
obj.modifiers[-1].smoke_type = 'DOMAIN' obj.modifiers[-1].smoke_type = 'DOMAIN'
if self.style == 'FIRE': if self.style == 'FIRE':
obj.modifiers[-1].domain_settings.use_dissolve_smoke = True obj.modifiers[-1].domain_settings.use_dissolve_smoke = True
@@ -161,7 +163,7 @@ class MakeSmoke(bpy.types.Operator):
obj.modifiers[-1].domain_settings.use_high_resolution = True obj.modifiers[-1].domain_settings.use_high_resolution = True
# create a volume material with a voxel data texture for the domain # create a volume material with a voxel data texture for the domain
bpy.ops.object.material_slot_add({"object": obj}) bpy.ops.object.material_slot_add()
mat = bpy.data.materials.new("Smoke Domain Material") mat = bpy.data.materials.new("Smoke Domain Material")
obj.material_slots[0].material = mat obj.material_slots[0].material = mat
@@ -224,6 +226,7 @@ class MakeFluid(bpy.types.Operator):
default=False) default=False)
def execute(self, context): def execute(self, context):
fake_context = bpy.context.copy()
mesh_objects = [obj for obj in context.selected_objects if (obj.type == 'MESH' and not 0 in obj.dimensions)] mesh_objects = [obj for obj in context.selected_objects if (obj.type == 'MESH' and not 0 in obj.dimensions)]
min_co = Vector((100000, 100000, 100000)) min_co = Vector((100000, 100000, 100000))
max_co = Vector((-100000, -100000, -100000)) max_co = Vector((-100000, -100000, -100000))
@@ -233,8 +236,9 @@ class MakeFluid(bpy.types.Operator):
return {'CANCELLED'} return {'CANCELLED'}
for obj in mesh_objects: for obj in mesh_objects:
fake_context["object"] = obj
# make each selected object a fluid # make each selected object a fluid
bpy.ops.object.modifier_add({"object": obj}, type='FLUID_SIMULATION') bpy.ops.object.modifier_add(fake_context, type='FLUID_SIMULATION')
# fluid has to be before constructive modifiers, so it might not be the last modifier # fluid has to be before constructive modifiers, so it might not be the last modifier
for mod in obj.modifiers: for mod in obj.modifiers:
@@ -266,14 +270,14 @@ class MakeFluid(bpy.types.Operator):
obj.scale = 0.5 * (max_co - min_co) + Vector((1.0, 1.0, 2.0)) + Vector((abs(v[0]), abs(v[1]), abs(v[2]))) obj.scale = 0.5 * (max_co - min_co) + Vector((1.0, 1.0, 2.0)) + Vector((abs(v[0]), abs(v[1]), abs(v[2])))
# setup smoke domain # setup smoke domain
bpy.ops.object.modifier_add({"object": obj}, type='FLUID_SIMULATION') bpy.ops.object.modifier_add(type='FLUID_SIMULATION')
obj.modifiers[-1].settings.type = 'DOMAIN' obj.modifiers[-1].settings.type = 'DOMAIN'
# make the domain smooth so it renders nicely # make the domain smooth so it renders nicely
bpy.ops.object.shade_smooth() bpy.ops.object.shade_smooth()
# create a ray-transparent material for the domain # create a ray-transparent material for the domain
bpy.ops.object.material_slot_add({"object": obj}) bpy.ops.object.material_slot_add()
mat = bpy.data.materials.new("Fluid Domain Material") mat = bpy.data.materials.new("Fluid Domain Material")
obj.material_slots[0].material = mat obj.material_slots[0].material = mat

View File

@@ -242,10 +242,10 @@ class AddPresetSunSky(AddPresetBase, bpy.types.Operator):
"sky.sun_brightness", "sky.sun_brightness",
"sky.sun_intensity", "sky.sun_intensity",
"sky.sun_size", "sky.sun_size",
"sky.use_sky_blend", "sky.sky_blend",
"sky.use_sky_blend_type", "sky.sky_blend_type",
"sky.use_sky_color_space", "sky.sky_color_space",
"sky.use_sky_exposure", "sky.sky_exposure",
] ]
preset_subdir = "sunsky" preset_subdir = "sunsky"

View File

@@ -800,9 +800,9 @@ class USERPREF_PT_input(InputKeyMapPanel):
sub.label(text="Zoom Style:") sub.label(text="Zoom Style:")
sub.row().prop(inputs, "view_zoom_method", text="") sub.row().prop(inputs, "view_zoom_method", text="")
if inputs.view_zoom_method == 'DOLLY': if inputs.view_zoom_method in {'DOLLY', 'CONTINUE'}:
sub.row().prop(inputs, "view_zoom_axis", expand=True) sub.row().prop(inputs, "view_zoom_axis", expand=True)
sub.prop(inputs, "invert_mouse_wheel_zoom") sub.prop(inputs, "invert_mouse_zoom")
#sub.prop(inputs, "use_mouse_mmb_paste") #sub.prop(inputs, "use_mouse_mmb_paste")

View File

@@ -122,7 +122,6 @@ class VIEW3D_PT_tools_meshedit(View3DPanel, bpy.types.Panel):
col = layout.column(align=True) col = layout.column(align=True)
col.label(text="Deform:") col.label(text="Deform:")
col.operator("transform.edge_slide") col.operator("transform.edge_slide")
col.operator("mesh.rip_move")
col.operator("mesh.noise") col.operator("mesh.noise")
col.operator("mesh.vertices_smooth") col.operator("mesh.vertices_smooth")

View File

@@ -215,10 +215,14 @@ class BUILTIN_KSI_VisualLocRot(bpy.types.KeyingSetInfo):
class BUILTIN_KSI_Available(bpy.types.KeyingSetInfo): class BUILTIN_KSI_Available(bpy.types.KeyingSetInfo):
bl_label = "Available" bl_label = "Available"
# poll - use predefined callback for selected objects # poll - selected objects or selected object with animation data
# TODO: this should really check whether the selected object (or datablock) def poll(ksi, context):
# has any animation data defined yet ob = context.active_object
poll = keyingsets_utils.RKS_POLL_selected_objects if ob:
# TODO: this fails if one animation-less object is active, but many others are selected
return ob.animation_data and ob.animation_data.action
else:
return bool(context.selected_objects)
# iterator - use callback for selected bones/objects # iterator - use callback for selected bones/objects
iterator = keyingsets_utils.RKS_ITER_selected_item iterator = keyingsets_utils.RKS_ITER_selected_item

View File

@@ -114,17 +114,17 @@ __declspec(dllexport) HRESULT vfGetPluginInfo(
static unsigned long getipaddress(const char * ipaddr) static unsigned long getipaddress(const char * ipaddr)
{ {
struct hostent *host; struct hostent *host;
unsigned long ip; unsigned long ip;
if (((ip = inet_addr(ipaddr)) == INADDR_NONE) if (((ip = inet_addr(ipaddr)) == INADDR_NONE)
&& strcmp(ipaddr, "255.255.255.255") != 0) { && strcmp(ipaddr, "255.255.255.255") != 0) {
if ((host = gethostbyname(ipaddr)) != NULL) { if ((host = gethostbyname(ipaddr)) != NULL) {
memcpy(&ip, host->h_addr, sizeof(ip)); memcpy(&ip, host->h_addr, sizeof(ip));
} }
} }
return (ip); return (ip);
} }
static void my_send(SOCKET sock, char * str) static void my_send(SOCKET sock, char * str)
@@ -363,12 +363,12 @@ HRESULT __stdcall VF_ReadDataFunc_Blen(
} while (strcmp(buf, "P6\n") != 0); } while (strcmp(buf, "P6\n") != 0);
do { do {
rval = my_gets(s_in, buf, 256); rval = my_gets(s_in, buf, 256);
} while ( (buf[0] == '#' || buf[0] == '\n') && rval >= 0); } while ( (buf[0] == '#' || buf[0] == '\n') && rval >= 0);
if (sscanf(buf, "%d %d\n", &width, &height) != 2) { if (sscanf(buf, "%d %d\n", &width, &height) != 2) {
goto errout; goto errout;
} }
if (width != c->width || height != c->height) { if (width != c->width || height != c->height) {
goto errout; goto errout;

View File

@@ -402,7 +402,7 @@ int AVI_is_avi (const char *name) {
/* at least one video track is needed */ /* at least one video track is needed */
return (movie_tracks != 0); return (movie_tracks != 0);
} }
AviError AVI_open_movie (const char *name, AviMovie *movie) { AviError AVI_open_movie (const char *name, AviMovie *movie) {

View File

@@ -42,102 +42,102 @@
#include "rgb32.h" #include "rgb32.h"
void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size) { void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size) {
if (from == to) if (from == to)
return buffer; return buffer;
if (from != AVI_FORMAT_RGB24 &&
to != AVI_FORMAT_RGB24)
return avi_format_convert(movie, stream,
avi_format_convert (movie, stream, buffer, from, AVI_FORMAT_RGB24, size),
AVI_FORMAT_RGB24, to, size);
switch (to) {
case AVI_FORMAT_RGB24:
switch (from) {
case AVI_FORMAT_AVI_RGB:
buffer = avi_converter_from_avi_rgb (movie, stream, buffer, size);
break;
case AVI_FORMAT_MJPEG:
buffer = avi_converter_from_mjpeg (movie, stream, buffer, size);
break;
case AVI_FORMAT_RGB32:
buffer = avi_converter_from_rgb32 (movie, stream, buffer, size);
break;
default:
break;
}
break;
case AVI_FORMAT_AVI_RGB:
buffer = avi_converter_to_avi_rgb (movie, stream, buffer, size);
break;
case AVI_FORMAT_MJPEG:
buffer = avi_converter_to_mjpeg (movie, stream, buffer, size);
break;
case AVI_FORMAT_RGB32:
buffer = avi_converter_to_rgb32 (movie, stream, buffer, size);
break;
default:
break;
}
return buffer; if (from != AVI_FORMAT_RGB24 &&
to != AVI_FORMAT_RGB24)
return avi_format_convert(movie, stream,
avi_format_convert (movie, stream, buffer, from, AVI_FORMAT_RGB24, size),
AVI_FORMAT_RGB24, to, size);
switch (to) {
case AVI_FORMAT_RGB24:
switch (from) {
case AVI_FORMAT_AVI_RGB:
buffer = avi_converter_from_avi_rgb (movie, stream, buffer, size);
break;
case AVI_FORMAT_MJPEG:
buffer = avi_converter_from_mjpeg (movie, stream, buffer, size);
break;
case AVI_FORMAT_RGB32:
buffer = avi_converter_from_rgb32 (movie, stream, buffer, size);
break;
default:
break;
}
break;
case AVI_FORMAT_AVI_RGB:
buffer = avi_converter_to_avi_rgb (movie, stream, buffer, size);
break;
case AVI_FORMAT_MJPEG:
buffer = avi_converter_to_mjpeg (movie, stream, buffer, size);
break;
case AVI_FORMAT_RGB32:
buffer = avi_converter_to_rgb32 (movie, stream, buffer, size);
break;
default:
break;
}
return buffer;
} }
int avi_get_data_id (AviFormat format, int stream) { int avi_get_data_id (AviFormat format, int stream) {
char fcc[5]; char fcc[5];
if (avi_get_format_type (format) == FCC("vids")) if (avi_get_format_type (format) == FCC("vids"))
sprintf (fcc,"%2.2ddc",stream); sprintf (fcc,"%2.2ddc",stream);
else if (avi_get_format_type (format) == FCC("auds")) else if (avi_get_format_type (format) == FCC("auds"))
sprintf (fcc,"%2.2ddc",stream); sprintf (fcc,"%2.2ddc",stream);
else else
return 0; return 0;
return FCC(fcc); return FCC(fcc);
} }
int avi_get_format_type (AviFormat format) { int avi_get_format_type (AviFormat format) {
switch (format) { switch (format) {
case AVI_FORMAT_RGB24: case AVI_FORMAT_RGB24:
case AVI_FORMAT_RGB32: case AVI_FORMAT_RGB32:
case AVI_FORMAT_AVI_RGB: case AVI_FORMAT_AVI_RGB:
case AVI_FORMAT_MJPEG: case AVI_FORMAT_MJPEG:
return FCC("vids"); return FCC("vids");
break; break;
default: default:
return 0; return 0;
break; break;
} }
} }
int avi_get_format_fcc (AviFormat format) { int avi_get_format_fcc (AviFormat format) {
switch (format) { switch (format) {
case AVI_FORMAT_RGB24: case AVI_FORMAT_RGB24:
case AVI_FORMAT_RGB32: case AVI_FORMAT_RGB32:
case AVI_FORMAT_AVI_RGB: case AVI_FORMAT_AVI_RGB:
return FCC("DIB "); return FCC("DIB ");
break; break;
case AVI_FORMAT_MJPEG: case AVI_FORMAT_MJPEG:
return FCC("MJPG"); return FCC("MJPG");
break; break;
default: default:
return 0; return 0;
break; break;
} }
} }
int avi_get_format_compression (AviFormat format) { int avi_get_format_compression (AviFormat format) {
switch (format) { switch (format) {
case AVI_FORMAT_RGB24: case AVI_FORMAT_RGB24:
case AVI_FORMAT_RGB32: case AVI_FORMAT_RGB32:
case AVI_FORMAT_AVI_RGB: case AVI_FORMAT_AVI_RGB:
return 0; return 0;
break; break;
case AVI_FORMAT_MJPEG: case AVI_FORMAT_MJPEG:
return FCC("MJPG"); return FCC("MJPG");
break; break;
default: default:
return 0; return 0;
break; break;
} }
} }

View File

@@ -53,77 +53,77 @@ AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream,
switch (option_type) { switch (option_type) {
case AVI_OPTION_TYPE_MAIN: case AVI_OPTION_TYPE_MAIN:
switch (option) { switch (option) {
case AVI_OPTION_WIDTH: case AVI_OPTION_WIDTH:
movie->header->Width = *((int *) opt_data); movie->header->Width = *((int *) opt_data);
movie->header->SuggestedBufferSize = movie->header->Width*movie->header->Height*3; movie->header->SuggestedBufferSize = movie->header->Width*movie->header->Height*3;
for (i=0; i < movie->header->Streams; i++) { for (i=0; i < movie->header->Streams; i++) {
if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) { if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
((AviBitmapInfoHeader *) movie->streams[i].sf)->Width = *((int *) opt_data); ((AviBitmapInfoHeader *) movie->streams[i].sf)->Width = *((int *) opt_data);
movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize; movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
movie->streams[i].sh.right = *((int *) opt_data); movie->streams[i].sh.right = *((int *) opt_data);
((AviBitmapInfoHeader *) movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize; ((AviBitmapInfoHeader *) movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET); fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH); awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
} }
}
break; break;
case AVI_OPTION_HEIGHT:
movie->header->Height = *((int *) opt_data);
movie->header->SuggestedBufferSize = movie->header->Width*movie->header->Height*3;
for (i=0; i < movie->header->Streams; i++) {
if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
((AviBitmapInfoHeader *) movie->streams[i].sf)->Height = *((int *) opt_data);
movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
movie->streams[i].sh.bottom = *((int *) opt_data);
((AviBitmapInfoHeader *) movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
}
break; case AVI_OPTION_HEIGHT:
movie->header->Height = *((int *) opt_data);
case AVI_OPTION_QUALITY: movie->header->SuggestedBufferSize = movie->header->Width*movie->header->Height*3;
for (i=0; i < movie->header->Streams; i++) {
if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
movie->streams[i].sh.Quality = (*((int *) opt_data))*100;
fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
}
break;
case AVI_OPTION_FRAMERATE:
if (1000000/(*((double *) opt_data)))
movie->header->MicroSecPerFrame = 1000000/(*((double *) opt_data));
for (i=0; i < movie->header->Streams; i++) { for (i=0; i < movie->header->Streams; i++) {
if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) { if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
movie->streams[i].sh.Scale = movie->header->MicroSecPerFrame; ((AviBitmapInfoHeader *) movie->streams[i].sf)->Height = *((int *) opt_data);
fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET); movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH); movie->streams[i].sh.bottom = *((int *) opt_data);
} ((AviBitmapInfoHeader *) movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
} }
}
break;
case AVI_OPTION_QUALITY:
for (i=0; i < movie->header->Streams; i++) {
if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
movie->streams[i].sh.Quality = (*((int *) opt_data))*100;
fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
}
break;
case AVI_OPTION_FRAMERATE:
if (1000000/(*((double *) opt_data)))
movie->header->MicroSecPerFrame = 1000000/(*((double *) opt_data));
for (i=0; i < movie->header->Streams; i++) {
if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
movie->streams[i].sh.Scale = movie->header->MicroSecPerFrame;
fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
}
} }
fseek (movie->fp, movie->offset_table[0], SEEK_SET); fseek (movie->fp, movie->offset_table[0], SEEK_SET);
awrite (movie, movie->header, 1, sizeof(AviMainHeader), movie->fp, AVI_MAINH); awrite (movie, movie->header, 1, sizeof(AviMainHeader), movie->fp, AVI_MAINH);
break; break;
case AVI_OPTION_TYPE_STRH: case AVI_OPTION_TYPE_STRH:
break; break;
case AVI_OPTION_TYPE_STRF: case AVI_OPTION_TYPE_STRF:
break; break;
default: default:
return AVI_ERROR_OPTION; return AVI_ERROR_OPTION;
break; break;
} }
return AVI_ERROR_NONE; return AVI_ERROR_NONE;
} }

View File

@@ -51,7 +51,7 @@ extern "C" {
/* used by packaging tools */ /* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */ /* can be left blank, otherwise a,b,c... etc with no quotes */
#define BLENDER_VERSION_CHAR #define BLENDER_VERSION_CHAR a
/* alpha/beta/rc/release, docs use this */ /* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE release #define BLENDER_VERSION_CYCLE release

View File

@@ -152,7 +152,7 @@ void sk_endContinuousStroke(SK_Stroke *stk);
void sk_updateNextPoint(SK_Sketch *sketch, SK_Stroke *stk); void sk_updateNextPoint(SK_Sketch *sketch, SK_Stroke *stk);
void sk_initDrawData(SK_DrawData *dd, short mval[2]); void sk_initDrawData(SK_DrawData *dd, const short mval[2]);
void sk_deleteSelectedStrokes(SK_Sketch *sketch); void sk_deleteSelectedStrokes(SK_Sketch *sketch);
void sk_selectAllSketch(SK_Sketch *sketch, int mode); void sk_selectAllSketch(SK_Sketch *sketch, int mode);

View File

@@ -89,6 +89,7 @@ void txt_split_curline (struct Text *text);
void txt_backspace_char (struct Text *text); void txt_backspace_char (struct Text *text);
void txt_backspace_word (struct Text *text); void txt_backspace_word (struct Text *text);
int txt_add_char (struct Text *text, char add); int txt_add_char (struct Text *text, char add);
int txt_add_raw_char (struct Text *text, char add);
int txt_replace_char (struct Text *text, char add); int txt_replace_char (struct Text *text, char add);
void txt_export_to_object (struct Text *text); void txt_export_to_object (struct Text *text);
void txt_export_to_objects(struct Text *text); void txt_export_to_objects(struct Text *text);

View File

@@ -24,6 +24,11 @@
# #
# ***** END GPL LICENSE BLOCK ***** # ***** END GPL LICENSE BLOCK *****
if(WITH_CODEC_FFMPEG)
# FFMPEG gives warnigns which are hard to avoid across multiple versions.
remove_strict_flags()
endif()
set(INC set(INC
. .
../avi ../avi

View File

@@ -1206,6 +1206,39 @@ static void animsys_evaluate_drivers (PointerRNA *ptr, AnimData *adt, float ctim
/* ***************************************** */ /* ***************************************** */
/* Actions Evaluation */ /* Actions Evaluation */
/* strictly not necessary for actual "evaluation", but it is a useful safety check
* to reduce the amount of times that users end up having to "revive" wrongly-assigned
* actions
*/
static void action_idcode_patch_check (ID *id, bAction *act)
{
int idcode = 0;
/* just in case */
if (ELEM(NULL, id, act))
return;
else
idcode = GS(id->name);
/* the actual checks... hopefully not too much of a performance hit in the long run... */
if (act->idroot == 0) {
/* use the current root if not set already (i.e. newly created actions and actions from 2.50-2.57 builds)
* - this has problems if there are 2 users, and the first one encountered is the invalid one
* in which case, the user will need to manually fix this (?)
*/
act->idroot = idcode;
}
else if (act->idroot != idcode) {
/* only report this error if debug mode is enabled (to save performance everywhere else) */
if (G.f & G_DEBUG) {
printf("AnimSys Safety Check Failed: Action '%s' is not meant to be used from ID-Blocks of type %d such as '%s'\n",
act->id.name+2, idcode, id->name);
}
}
}
/* ----------------------------------------- */
/* Evaluate Action Group */ /* Evaluate Action Group */
void animsys_evaluate_action_group (PointerRNA *ptr, bAction *act, bActionGroup *agrp, AnimMapper *remap, float ctime) void animsys_evaluate_action_group (PointerRNA *ptr, bAction *act, bActionGroup *agrp, AnimMapper *remap, float ctime)
{ {
@@ -1215,6 +1248,8 @@ void animsys_evaluate_action_group (PointerRNA *ptr, bAction *act, bActionGroup
if ELEM(NULL, act, agrp) return; if ELEM(NULL, act, agrp) return;
if ((remap) && (remap->target != act)) remap= NULL; if ((remap) && (remap->target != act)) remap= NULL;
action_idcode_patch_check(ptr->id.data, act);
/* if group is muted, don't evaluated any of the F-Curve */ /* if group is muted, don't evaluated any of the F-Curve */
if (agrp->flag & AGRP_MUTED) if (agrp->flag & AGRP_MUTED)
return; return;
@@ -1238,6 +1273,8 @@ void animsys_evaluate_action (PointerRNA *ptr, bAction *act, AnimMapper *remap,
if (act == NULL) return; if (act == NULL) return;
if ((remap) && (remap->target != act)) remap= NULL; if ((remap) && (remap->target != act)) remap= NULL;
action_idcode_patch_check(ptr->id.data, act);
/* calculate then execute each curve */ /* calculate then execute each curve */
animsys_evaluate_fcurves(ptr, &act->curves, remap, ctime); animsys_evaluate_fcurves(ptr, &act->curves, remap, ctime);
} }
@@ -1637,6 +1674,17 @@ static void nlastrip_evaluate_actionclip (PointerRNA *ptr, ListBase *channels, L
FCurve *fcu; FCurve *fcu;
float evaltime; float evaltime;
/* sanity checks for action */
if (strip == NULL)
return;
if (strip->act == NULL) {
printf("NLA-Strip Eval Error: Strip '%s' has no Action\n", strip->name);
return;
}
action_idcode_patch_check(ptr->id.data, strip->act);
/* join this strip's modifiers to the parent's modifiers (own modifiers first) */ /* join this strip's modifiers to the parent's modifiers (own modifiers first) */
nlaeval_fmodifiers_join_stacks(&tmp_modifiers, &strip->modifiers, modifiers); nlaeval_fmodifiers_join_stacks(&tmp_modifiers, &strip->modifiers, modifiers);

View File

@@ -214,6 +214,11 @@ bArmature *copy_armature(bArmature *arm)
}; };
newArm->act_bone= newActBone; newArm->act_bone= newActBone;
newArm->edbo= NULL;
newArm->act_edbone= NULL;
newArm->sketch= NULL;
return newArm; return newArm;
} }
@@ -1226,10 +1231,10 @@ void pchan_apply_mat4(bPoseChannel *pchan, float mat[][4], short use_compat)
*/ */
void armature_mat_pose_to_delta(float delta_mat[][4], float pose_mat[][4], float arm_mat[][4]) void armature_mat_pose_to_delta(float delta_mat[][4], float pose_mat[][4], float arm_mat[][4])
{ {
float imat[4][4]; float imat[4][4];
invert_m4_m4(imat, arm_mat); invert_m4_m4(imat, arm_mat);
mul_m4_m4m4(delta_mat, pose_mat, imat); mul_m4_m4m4(delta_mat, pose_mat, imat);
} }
/* **************** Rotation Mode Conversions ****************************** */ /* **************** Rotation Mode Conversions ****************************** */

View File

@@ -1119,12 +1119,12 @@ float brush_curve_strength_clamp(Brush *br, float p, const float len)
* used for sculpt only */ * used for sculpt only */
float brush_curve_strength(Brush *br, float p, const float len) float brush_curve_strength(Brush *br, float p, const float len)
{ {
if(p >= len) if(p >= len)
p= 1.0f; p= 1.0f;
else else
p= p/len; p= p/len;
return curvemapping_evaluateF(br->curve, 0, p); return curvemapping_evaluateF(br->curve, 0, p);
} }
/* TODO: should probably be unified with BrushPainter stuff? */ /* TODO: should probably be unified with BrushPainter stuff? */

View File

@@ -197,8 +197,20 @@ static int can_pbvh_draw(Object *ob, DerivedMesh *dm)
{ {
CDDerivedMesh *cddm = (CDDerivedMesh*) dm; CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
Mesh *me= ob->data; Mesh *me= ob->data;
int deformed= 0;
if(ob->sculpt->modifiers_active) return 0; /* active modifiers means extra deformation, which can't be handled correct
on bith of PBVH and sculpt "layer" levels, so use PBVH only for internal brush
stuff and show final DerivedMesh so user would see actual object shape */
deformed|= ob->sculpt->modifiers_active;
/* as in case with modifiers, we can't synchronize deformation made against
PBVH and non-locked keyblock, so also use PBVH only for brushes and
final DM to give final result to user */
deformed|= ob->sculpt->kb && (ob->shapeflag&OB_SHAPE_LOCK) == 0;
if(deformed)
return 0;
return (cddm->mvert == me->mvert) || ob->sculpt->kb; return (cddm->mvert == me->mvert) || ob->sculpt->kb;
} }

View File

@@ -856,10 +856,10 @@ static int cloth_collision_response_moving( ClothModifierData *clmd, CollisionMo
#if 0 #if 0
static float projectPointOntoLine(float *p, float *a, float *b) static float projectPointOntoLine(float *p, float *a, float *b)
{ {
float ba[3], pa[3]; float ba[3], pa[3];
VECSUB(ba, b, a); VECSUB(ba, b, a);
VECSUB(pa, p, a); VECSUB(pa, p, a);
return INPR(pa, ba) / INPR(ba, ba); return INPR(pa, ba) / INPR(ba, ba);
} }
static void calculateEENormal(float *np1, float *np2, float *np3, float *np4,float *out_normal) static void calculateEENormal(float *np1, float *np2, float *np3, float *np4,float *out_normal)

View File

@@ -793,7 +793,7 @@ void curvemapping_evaluate_premulRGBF(CurveMapping *cumap, float *vecout, const
/* basic error handler, if we dont do this blender will exit */ /* basic error handler, if we dont do this blender will exit */
static int ErrorReportingFunction(int ErrorCode, const char *ErrorText) static int ErrorReportingFunction(int ErrorCode, const char *ErrorText)
{ {
fprintf(stderr, "%s:%d\n", ErrorText, ErrorCode); fprintf(stderr, "%s:%d\n", ErrorText, ErrorCode);
return 1; return 1;
} }
#endif #endif

View File

@@ -201,6 +201,7 @@ Curve *copy_curve(Curve *cu)
cun->editnurb= NULL; cun->editnurb= NULL;
cun->editfont= NULL; cun->editfont= NULL;
cun->selboxes= NULL;
#if 0 // XXX old animation system #if 0 // XXX old animation system
/* single user ipo too */ /* single user ipo too */
@@ -1025,19 +1026,19 @@ void forward_diff_bezier(float q0, float q1, float q2, float q3, float *p, int i
rt2= 3.0f*(q0-2.0f*q1+q2)/f; rt2= 3.0f*(q0-2.0f*q1+q2)/f;
f*= it; f*= it;
rt3= (q3-q0+3.0f*(q1-q2))/f; rt3= (q3-q0+3.0f*(q1-q2))/f;
q0= rt0; q0= rt0;
q1= rt1+rt2+rt3; q1= rt1+rt2+rt3;
q2= 2*rt2+6*rt3; q2= 2*rt2+6*rt3;
q3= 6*rt3; q3= 6*rt3;
for(a=0; a<=it; a++) { for(a=0; a<=it; a++) {
*p= q0; *p= q0;
p = (float *)(((char *)p)+stride); p = (float *)(((char *)p)+stride);
q0+= q1; q0+= q1;
q1+= q2; q1+= q2;
q2+= q3; q2+= q3;
} }
} }
static void forward_diff_bezier_cotangent(float *p0, float *p1, float *p2, float *p3, float *p, int it, int stride) static void forward_diff_bezier_cotangent(float *p0, float *p1, float *p2, float *p3, float *p, int it, int stride)
@@ -1047,7 +1048,7 @@ static void forward_diff_bezier_cotangent(float *p0, float *p1, float *p2, float
* *
* This could also be optimized like forward_diff_bezier */ * This could also be optimized like forward_diff_bezier */
int a; int a;
for(a=0; a<=it; a++) { for(a=0; a<=it; a++) {
float t = (float)a / (float)it; float t = (float)a / (float)it;
int i; int i;
@@ -1056,7 +1057,7 @@ static void forward_diff_bezier_cotangent(float *p0, float *p1, float *p2, float
} }
normalize_v3(p); normalize_v3(p);
p = (float *)(((char *)p)+stride); p = (float *)(((char *)p)+stride);
} }
} }
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -1091,7 +1092,7 @@ float *make_orco_surf(Object *ob)
sizev = nu->pntsv*resolv; sizev = nu->pntsv*resolv;
if (nu->flagu & CU_NURB_CYCLIC) sizeu++; if (nu->flagu & CU_NURB_CYCLIC) sizeu++;
if (nu->flagv & CU_NURB_CYCLIC) sizev++; if (nu->flagv & CU_NURB_CYCLIC) sizev++;
if(nu->pntsv>1) tot+= sizeu * sizev; if(nu->pntsv>1) tot+= sizeu * sizev;
nu= nu->next; nu= nu->next;
} }

View File

@@ -254,7 +254,6 @@ int defgroup_find_index (Object *ob, bDeformGroup *dg)
if (eg == NULL) return -1; if (eg == NULL) return -1;
return def_nr; return def_nr;
} }
/* note, must be freed */ /* note, must be freed */
@@ -361,7 +360,7 @@ void flip_side_name (char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP
index= strrchr(name, '.'); // last occurrence index= strrchr(name, '.'); // last occurrence
if (index && isdigit(index[1]) ) { // doesnt handle case bone.1abc2 correct..., whatever! if (index && isdigit(index[1]) ) { // doesnt handle case bone.1abc2 correct..., whatever!
if(strip_number==0) if(strip_number==0)
BLI_strncpy(number, index, sizeof(number)); BLI_strncpy(number, index, sizeof(number));
*index= 0; *index= 0;
len= BLI_strnlen(name, MAX_VGROUP_NAME); len= BLI_strnlen(name, MAX_VGROUP_NAME);
} }

View File

@@ -492,7 +492,7 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
} }
} }
} }
/* softbody collision */ /* softbody collision */
if ((ob->type==OB_MESH) || (ob->type==OB_CURVE) || (ob->type==OB_LATTICE)) { if ((ob->type==OB_MESH) || (ob->type==OB_CURVE) || (ob->type==OB_LATTICE)) {
if(modifiers_isSoftbodyEnabled(ob) || modifiers_isClothEnabled(ob) || ob->particlesystem.first) if(modifiers_isSoftbodyEnabled(ob) || modifiers_isClothEnabled(ob) || ob->particlesystem.first)
@@ -1092,10 +1092,10 @@ void graph_bfs(void)
push_queue(nqueue,itA->node); push_queue(nqueue,itA->node);
} }
else { else {
fprintf(stderr,"bfs not dag tree edge color :%i \n",itA->node->color); fprintf(stderr,"bfs not dag tree edge color :%i \n",itA->node->color);
} }
itA = itA->next; itA = itA->next;
} }
@@ -1225,7 +1225,7 @@ DagNodeQueue * graph_dfs(void)
while(nqueue->count) { while(nqueue->count) {
//graph_print_queue(nqueue); //graph_print_queue(nqueue);
skip = 0; skip = 0;
node = get_top_node_queue(nqueue); node = get_top_node_queue(nqueue);
minheight = pos[node->DFS_dist]; minheight = pos[node->DFS_dist];
@@ -1253,7 +1253,7 @@ DagNodeQueue * graph_dfs(void)
*/ */
/*if (node->DFS_dist >= itA->node->DFS_dist) /*if (node->DFS_dist >= itA->node->DFS_dist)
itA->node->DFS_dist = node->DFS_dist + 1; itA->node->DFS_dist = node->DFS_dist + 1;
fprintf(stderr,"dfs forward or cross edge :%15s %i-%i %15s %i-%i \n", fprintf(stderr,"dfs forward or cross edge :%15s %i-%i %15s %i-%i \n",
((ID *) node->ob)->name, ((ID *) node->ob)->name,
node->DFS_dvtm, node->DFS_dvtm,
@@ -1287,17 +1287,17 @@ DagNodeQueue * graph_dfs(void)
/* /*
fprintf(stderr,"DFS node : %20s %i %i %i %i\n",((ID *) node->ob)->name,node->BFS_dist, node->DFS_dist, node->DFS_dvtm, node->DFS_fntm ); fprintf(stderr,"DFS node : %20s %i %i %i %i\n",((ID *) node->ob)->name,node->BFS_dist, node->DFS_dist, node->DFS_dvtm, node->DFS_fntm );
*/ */
push_stack(retqueue,node); push_stack(retqueue,node);
} }
} }
} }
node = node->next; node = node->next;
} while (node); } while (node);
// fprintf(stderr,"i size : %i \n", maxpos); // fprintf(stderr,"i size : %i \n", maxpos);
queue_delete(nqueue); queue_delete(nqueue);
return(retqueue); return(retqueue);
} }
/* unused */ /* unused */

View File

@@ -1869,9 +1869,9 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
already applied, thats how it worked for years, so keep for compatibility (sergey) */ already applied, thats how it worked for years, so keep for compatibility (sergey) */
copy_displist(&cu->disp, dispbase); copy_displist(&cu->disp, dispbase);
if (!forRender) { if (!forRender) {
tex_space_curve(cu); tex_space_curve(cu);
} }
if(!forOrco) curve_calc_modifiers_post(scene, ob, dispbase, derivedFinal, forRender, originalVerts, deformedVerts); if(!forOrco) curve_calc_modifiers_post(scene, ob, dispbase, derivedFinal, forRender, originalVerts, deformedVerts);

View File

@@ -138,22 +138,22 @@ static int is_stl(const char *str)
return 1; return 1;
} }
#define READSTLVERT { \ #define READSTLVERT { \
if (fread(mvert->co, sizeof(float), 3, fpSTL) != 3) { \ if (fread(mvert->co, sizeof(float), 3, fpSTL) != 3) { \
char error_msg[255]; \ char error_msg[255]; \
MEM_freeN(vertdata); \ MEM_freeN(vertdata); \
MEM_freeN(facedata); \ MEM_freeN(facedata); \
fclose(fpSTL); \ fclose(fpSTL); \
sprintf(error_msg, "Problems reading face %d!", i); \ sprintf(error_msg, "Problems reading face %d!", i); \
return; \ return; \
} \ } \
else { \ else { \
if (ENDIAN_ORDER==B_ENDIAN) { \ if (ENDIAN_ORDER==B_ENDIAN) { \
SWITCH_INT(mvert->co[0]); \ SWITCH_INT(mvert->co[0]); \
SWITCH_INT(mvert->co[1]); \ SWITCH_INT(mvert->co[1]); \
SWITCH_INT(mvert->co[2]); \ SWITCH_INT(mvert->co[2]); \
} \ } \
} \ } \
} }
static void simple_vertex_normal_blend(short *no, short *ble) static void simple_vertex_normal_blend(short *no, short *ble)
@@ -889,7 +889,7 @@ void write_dxf(struct Scene *scene, char *str)
write_group(0, "SECTION"); write_group(0, "SECTION");
write_group(2, "BLOCKS"); write_group(2, "BLOCKS");
/* only write meshes we're using in this scene */ /* only write meshes we're using in this scene */
flag_listbase_ids(&G.main->mesh, LIB_DOIT, 0); flag_listbase_ids(&G.main->mesh, LIB_DOIT, 0);
@@ -1608,7 +1608,7 @@ static void dxf_read_arc(Scene *scene, int noob)
dia = (float) atof(val); dia = (float) atof(val);
} else if (id==62) { } else if (id==62) {
int colorid= atoi(val); int colorid= atoi(val);
CLAMP(colorid, 1, 255); CLAMP(colorid, 1, 255);
dxf_col_to_rgb(colorid, &color[0], &color[1], &color[2]); dxf_col_to_rgb(colorid, &color[0], &color[1], &color[2]);
} else if (id==67) { } else if (id==67) {

View File

@@ -78,9 +78,12 @@ IDProperty *IDP_NewIDPArray(const char *name)
IDProperty *IDP_CopyIDPArray(IDProperty *array) IDProperty *IDP_CopyIDPArray(IDProperty *array)
{ {
IDProperty *narray = MEM_dupallocN(array), *tmp; /* dont use MEM_dupallocN because this may be part of an array */
IDProperty *narray = MEM_mallocN(sizeof(IDProperty), "IDP_CopyIDPArray"), *tmp;
int i; int i;
*narray= *array;
narray->data.pointer = MEM_dupallocN(array->data.pointer); narray->data.pointer = MEM_dupallocN(array->data.pointer);
for (i=0; i<narray->len; i++) { for (i=0; i<narray->len; i++) {
/*ok, the copy functions always allocate a new structure, /*ok, the copy functions always allocate a new structure,

View File

@@ -80,10 +80,10 @@ void BKE_image_buf_fill_checker(unsigned char *rect, float *rect_float, int widt
int checkerwidth= 32, dark= 1; int checkerwidth= 32, dark= 1;
int x, y; int x, y;
unsigned char *rect_orig= rect; unsigned char *rect_orig= rect;
float *rect_float_orig= rect_float; float *rect_float_orig= rect_float;
float h=0.0, hoffs=0.0, hue=0.0, s=0.9, v=0.9, r, g, b; float h=0.0, hoffs=0.0, hue=0.0, s=0.9, v=0.9, r, g, b;
@@ -191,7 +191,7 @@ static void checker_board_color_fill(unsigned char *rect, float *rect_float, int
for(y= 0; y < height; y++) for(y= 0; y < height; y++)
{ {
val= 0.1 + (y * (0.4 / height)); /* use a number lower then 1.0 else its too bright */ val= 0.1 + (y * (0.4 / height)); /* use a number lower then 1.0 else its too bright */
for(x= 0; x < width; x++) for(x= 0; x < width; x++)
{ {
@@ -316,17 +316,17 @@ static void checker_board_text(unsigned char *rect, float *rect_float, int width
BLF_size(mono, 54, 72); /* hard coded size! */ BLF_size(mono, 54, 72); /* hard coded size! */
BLF_buffer(mono, rect_float, rect, width, height, 4); BLF_buffer(mono, rect_float, rect, width, height, 4);
for(y= 0; y < height; y+=step) for(y= 0; y < height; y+=step)
{ {
text[1]= '1'; text[1]= '1';
for(x= 0; x < width; x+=step) for(x= 0; x < width; x+=step)
{ {
/* hard coded offset */ /* hard coded offset */
pen_x = x + 33; pen_x = x + 33;
pen_y = y + 44; pen_y = y + 44;
/* terribly crappy outline font! */ /* terribly crappy outline font! */
BLF_buffer_col(mono, 1.0, 1.0, 1.0, 1.0); BLF_buffer_col(mono, 1.0, 1.0, 1.0, 1.0);
@@ -338,7 +338,7 @@ static void checker_board_text(unsigned char *rect, float *rect_float, int width
BLF_draw_buffer(mono, text); BLF_draw_buffer(mono, text);
BLF_position(mono, pen_x, pen_y+outline, 0.0); BLF_position(mono, pen_x, pen_y+outline, 0.0);
BLF_draw_buffer(mono, text); BLF_draw_buffer(mono, text);
BLF_position(mono, pen_x-outline, pen_y-outline, 0.0); BLF_position(mono, pen_x-outline, pen_y-outline, 0.0);
BLF_draw_buffer(mono, text); BLF_draw_buffer(mono, text);
BLF_position(mono, pen_x+outline, pen_y+outline, 0.0); BLF_position(mono, pen_x+outline, pen_y+outline, 0.0);
@@ -351,12 +351,12 @@ static void checker_board_text(unsigned char *rect, float *rect_float, int width
BLF_buffer_col(mono, 0.0, 0.0, 0.0, 1.0); BLF_buffer_col(mono, 0.0, 0.0, 0.0, 1.0);
BLF_position(mono, pen_x, pen_y, 0.0); BLF_position(mono, pen_x, pen_y, 0.0);
BLF_draw_buffer(mono, text); BLF_draw_buffer(mono, text);
text[1]++; text[1]++;
} }
text[0]++; text[0]++;
} }
/* cleanup the buffer. */ /* cleanup the buffer. */
BLF_buffer(mono, NULL, NULL, 0, 0, 0); BLF_buffer(mono, NULL, NULL, 0, 0, 0);
} }

View File

@@ -1372,7 +1372,7 @@ static void icu_to_fcurves (ID *id, ListBase *groups, ListBase *list, IpoCurve *
* This does not assume that any ID or AnimData uses it, but does assume that * This does not assume that any ID or AnimData uses it, but does assume that
* it is given two lists, which it will perform driver/animation-data separation. * it is given two lists, which it will perform driver/animation-data separation.
*/ */
static void ipo_to_animato (ID *id, Ipo *ipo, char actname[], char constname[], Sequence * seq, ListBase *animgroups, ListBase *anim, ListBase *drivers) static void ipo_to_animato (ID *id, Ipo *ipo, char actname[], char constname[], Sequence *seq, ListBase *animgroups, ListBase *anim, ListBase *drivers)
{ {
IpoCurve *icu; IpoCurve *icu;
@@ -1416,8 +1416,7 @@ static void ipo_to_animato (ID *id, Ipo *ipo, char actname[], char constname[],
/* if this IPO block doesn't have any users after this one, free... */ /* if this IPO block doesn't have any users after this one, free... */
ipo->id.us--; ipo->id.us--;
if ( (ipo->id.us == 0) || ((ipo->id.us == 1) && (ipo->id.flag & LIB_FAKEUSER)) ) if (ID_REAL_USERS(ipo) <= 0) {
{
IpoCurve *icn; IpoCurve *icn;
for (icu= ipo->curve.first; icu; icu= icn) { for (icu= ipo->curve.first; icu; icu= icn) {
@@ -1668,7 +1667,6 @@ void do_versions_ipos_to_animato(Main *main)
{ {
ListBase drivers = {NULL, NULL}; ListBase drivers = {NULL, NULL};
ID *id; ID *id;
AnimData *adt;
if (main == NULL) { if (main == NULL) {
printf("Argh! Main is NULL in do_versions_ipos_to_animato() \n"); printf("Argh! Main is NULL in do_versions_ipos_to_animato() \n");
@@ -1697,7 +1695,7 @@ void do_versions_ipos_to_animato(Main *main)
/* check if object has any animation data */ /* check if object has any animation data */
if (ob->nlastrips.first) { if (ob->nlastrips.first) {
/* Add AnimData block */ /* Add AnimData block */
adt= BKE_id_add_animdata(id); BKE_id_add_animdata(id);
/* IPO first to take into any non-NLA'd Object Animation */ /* IPO first to take into any non-NLA'd Object Animation */
if (ob->ipo) { if (ob->ipo) {
@@ -1720,7 +1718,7 @@ void do_versions_ipos_to_animato(Main *main)
} }
else if ((ob->ipo) || (ob->action)) { else if ((ob->ipo) || (ob->action)) {
/* Add AnimData block */ /* Add AnimData block */
adt= BKE_id_add_animdata(id); AnimData *adt= BKE_id_add_animdata(id);
/* Action first - so that Action name get conserved */ /* Action first - so that Action name get conserved */
if (ob->action) { if (ob->action) {
@@ -1804,6 +1802,13 @@ void do_versions_ipos_to_animato(Main *main)
BLI_freelinkN(&ob->constraintChannels, conchan); BLI_freelinkN(&ob->constraintChannels, conchan);
} }
} }
/* object's action will always be object-rooted */
{
AnimData *adt= BKE_animdata_from_id(id);
if (adt && adt->action)
adt->action->idroot = ID_OB;
}
} }
/* shapekeys */ /* shapekeys */
@@ -1818,10 +1823,14 @@ void do_versions_ipos_to_animato(Main *main)
*/ */
if (key->ipo) { if (key->ipo) {
/* Add AnimData block */ /* Add AnimData block */
adt= BKE_id_add_animdata(id); AnimData *adt= BKE_id_add_animdata(id);
/* Convert Shapekey data... */ /* Convert Shapekey data... */
ipo_to_animdata(id, key->ipo, NULL, NULL, NULL); ipo_to_animdata(id, key->ipo, NULL, NULL, NULL);
if (adt->action)
adt->action->idroot = key->ipo->blocktype;
key->ipo->id.us--; key->ipo->id.us--;
key->ipo= NULL; key->ipo= NULL;
} }
@@ -1836,10 +1845,14 @@ void do_versions_ipos_to_animato(Main *main)
/* we're only interested in the IPO */ /* we're only interested in the IPO */
if (ma->ipo) { if (ma->ipo) {
/* Add AnimData block */ /* Add AnimData block */
adt= BKE_id_add_animdata(id); AnimData *adt= BKE_id_add_animdata(id);
/* Convert Material data... */ /* Convert Material data... */
ipo_to_animdata(id, ma->ipo, NULL, NULL, NULL); ipo_to_animdata(id, ma->ipo, NULL, NULL, NULL);
if (adt->action)
adt->action->idroot = ma->ipo->blocktype;
ma->ipo->id.us--; ma->ipo->id.us--;
ma->ipo= NULL; ma->ipo= NULL;
} }
@@ -1854,10 +1867,14 @@ void do_versions_ipos_to_animato(Main *main)
/* we're only interested in the IPO */ /* we're only interested in the IPO */
if (wo->ipo) { if (wo->ipo) {
/* Add AnimData block */ /* Add AnimData block */
adt= BKE_id_add_animdata(id); AnimData *adt= BKE_id_add_animdata(id);
/* Convert World data... */ /* Convert World data... */
ipo_to_animdata(id, wo->ipo, NULL, NULL, NULL); ipo_to_animdata(id, wo->ipo, NULL, NULL, NULL);
if (adt->action)
adt->action->idroot = wo->ipo->blocktype;
wo->ipo->id.us--; wo->ipo->id.us--;
wo->ipo= NULL; wo->ipo= NULL;
} }
@@ -1870,7 +1887,7 @@ void do_versions_ipos_to_animato(Main *main)
if (ed && ed->seqbasep) { if (ed && ed->seqbasep) {
Sequence * seq; Sequence * seq;
adt= BKE_id_add_animdata(id); AnimData *adt= BKE_id_add_animdata(id);
SEQ_BEGIN(ed, seq) { SEQ_BEGIN(ed, seq) {
IpoCurve *icu = (seq->ipo) ? seq->ipo->curve.first : NULL; IpoCurve *icu = (seq->ipo) ? seq->ipo->curve.first : NULL;
@@ -1904,6 +1921,10 @@ void do_versions_ipos_to_animato(Main *main)
/* convert IPO */ /* convert IPO */
ipo_to_animdata((ID *)scene, seq->ipo, NULL, NULL, seq); ipo_to_animdata((ID *)scene, seq->ipo, NULL, NULL, seq);
if (adt->action)
adt->action->idroot = ID_SCE; /* scene-rooted */
seq->ipo->id.us--; seq->ipo->id.us--;
seq->ipo = NULL; seq->ipo = NULL;
} }
@@ -1921,10 +1942,14 @@ void do_versions_ipos_to_animato(Main *main)
/* we're only interested in the IPO */ /* we're only interested in the IPO */
if (te->ipo) { if (te->ipo) {
/* Add AnimData block */ /* Add AnimData block */
adt= BKE_id_add_animdata(id); AnimData *adt= BKE_id_add_animdata(id);
/* Convert Texture data... */ /* Convert Texture data... */
ipo_to_animdata(id, te->ipo, NULL, NULL, NULL); ipo_to_animdata(id, te->ipo, NULL, NULL, NULL);
if (adt->action)
adt->action->idroot = te->ipo->blocktype;
te->ipo->id.us--; te->ipo->id.us--;
te->ipo= NULL; te->ipo= NULL;
} }
@@ -1939,10 +1964,14 @@ void do_versions_ipos_to_animato(Main *main)
/* we're only interested in the IPO */ /* we're only interested in the IPO */
if (ca->ipo) { if (ca->ipo) {
/* Add AnimData block */ /* Add AnimData block */
adt= BKE_id_add_animdata(id); AnimData *adt= BKE_id_add_animdata(id);
/* Convert Camera data... */ /* Convert Camera data... */
ipo_to_animdata(id, ca->ipo, NULL, NULL, NULL); ipo_to_animdata(id, ca->ipo, NULL, NULL, NULL);
if (adt->action)
adt->action->idroot = ca->ipo->blocktype;
ca->ipo->id.us--; ca->ipo->id.us--;
ca->ipo= NULL; ca->ipo= NULL;
} }
@@ -1957,10 +1986,14 @@ void do_versions_ipos_to_animato(Main *main)
/* we're only interested in the IPO */ /* we're only interested in the IPO */
if (la->ipo) { if (la->ipo) {
/* Add AnimData block */ /* Add AnimData block */
adt= BKE_id_add_animdata(id); AnimData *adt= BKE_id_add_animdata(id);
/* Convert Lamp data... */ /* Convert Lamp data... */
ipo_to_animdata(id, la->ipo, NULL, NULL, NULL); ipo_to_animdata(id, la->ipo, NULL, NULL, NULL);
if (adt->action)
adt->action->idroot = la->ipo->blocktype;
la->ipo->id.us--; la->ipo->id.us--;
la->ipo= NULL; la->ipo= NULL;
} }
@@ -1975,10 +2008,14 @@ void do_versions_ipos_to_animato(Main *main)
/* we're only interested in the IPO */ /* we're only interested in the IPO */
if (cu->ipo) { if (cu->ipo) {
/* Add AnimData block */ /* Add AnimData block */
adt= BKE_id_add_animdata(id); AnimData *adt= BKE_id_add_animdata(id);
/* Convert Curve data... */ /* Convert Curve data... */
ipo_to_animdata(id, cu->ipo, NULL, NULL, NULL); ipo_to_animdata(id, cu->ipo, NULL, NULL, NULL);
if (adt->action)
adt->action->idroot = cu->ipo->blocktype;
cu->ipo->id.us--; cu->ipo->id.us--;
cu->ipo= NULL; cu->ipo= NULL;
} }
@@ -2001,6 +2038,10 @@ void do_versions_ipos_to_animato(Main *main)
if (G.f & G_DEBUG) printf("\tconverting action %s \n", id->name+2); if (G.f & G_DEBUG) printf("\tconverting action %s \n", id->name+2);
/* if old action, it will be object-only... */
if (act->chanbase.first)
act->idroot = ID_OB;
/* be careful! some of the actions we encounter will be converted ones... */ /* be careful! some of the actions we encounter will be converted ones... */
action_to_animato(NULL, act, &act->groups, &act->curves, &drivers); action_to_animato(NULL, act, &act->groups, &act->curves, &drivers);
} }
@@ -2018,6 +2059,7 @@ void do_versions_ipos_to_animato(Main *main)
/* add a new action for this, and convert all data into that action */ /* add a new action for this, and convert all data into that action */
new_act= add_empty_action("ConvIPO_Action"); // XXX need a better name... new_act= add_empty_action("ConvIPO_Action"); // XXX need a better name...
ipo_to_animato(NULL, ipo, NULL, NULL, NULL, NULL, &new_act->curves, &drivers); ipo_to_animato(NULL, ipo, NULL, NULL, NULL, NULL, &new_act->curves, &drivers);
new_act->idroot = ipo->blocktype;
} }
/* clear fake-users, and set user-count to zero to make sure it is cleared on file-save */ /* clear fake-users, and set user-count to zero to make sure it is cleared on file-save */

View File

@@ -219,7 +219,9 @@ Lattice *copy_lattice(Lattice *lt)
ltn->dvert = MEM_mallocN (sizeof (MDeformVert)*tot, "Lattice MDeformVert"); ltn->dvert = MEM_mallocN (sizeof (MDeformVert)*tot, "Lattice MDeformVert");
copy_dverts(ltn->dvert, lt->dvert, tot); copy_dverts(ltn->dvert, lt->dvert, tot);
} }
ltn->editlatt= NULL;
return ltn; return ltn;
} }

View File

@@ -1171,7 +1171,7 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name)
int new_id(ListBase *lb, ID *id, const char *tname) int new_id(ListBase *lb, ID *id, const char *tname)
{ {
int result; int result;
char name[22]; char name[MAX_ID_NAME-2];
/* if library, don't rename */ /* if library, don't rename */
if(id->lib) return 0; if(id->lib) return 0;

View File

@@ -1315,12 +1315,12 @@ void ramp_blend(int type, float *r, float *g, float *b, float fac, float *col)
case MA_RAMP_SOFT: case MA_RAMP_SOFT:
if (g){ if (g){
float scr, scg, scb; float scr, scg, scb;
/* first calculate non-fac based Screen mix */ /* first calculate non-fac based Screen mix */
scr = 1.0f - (1.0f - col[0]) * (1.0f - *r); scr = 1.0f - (1.0f - col[0]) * (1.0f - *r);
scg = 1.0f - (1.0f - col[1]) * (1.0f - *g); scg = 1.0f - (1.0f - col[1]) * (1.0f - *g);
scb = 1.0f - (1.0f - col[2]) * (1.0f - *b); scb = 1.0f - (1.0f - col[2]) * (1.0f - *b);
*r = facm*(*r) + fac*(((1.0f - *r) * col[0] * (*r)) + (*r * scr)); *r = facm*(*r) + fac*(((1.0f - *r) * col[0] * (*r)) + (*r * scr));
*g = facm*(*g) + fac*(((1.0f - *g) * col[1] * (*g)) + (*g * scg)); *g = facm*(*g) + fac*(((1.0f - *g) * col[1] * (*g)) + (*g * scg));
*b = facm*(*b) + fac*(((1.0f - *b) * col[2] * (*b)) + (*b * scb)); *b = facm*(*b) + fac*(((1.0f - *b) * col[2] * (*b)) + (*b * scb));

View File

@@ -132,6 +132,9 @@ MetaBall *copy_mball(MetaBall *mb)
id_us_plus((ID *)mbn->mat[a]); id_us_plus((ID *)mbn->mat[a]);
} }
mbn->bb= MEM_dupallocN(mb->bb); mbn->bb= MEM_dupallocN(mb->bb);
mbn->editelems= NULL;
mbn->lastelem= NULL;
return mbn; return mbn;
} }
@@ -187,7 +190,7 @@ void make_local_mball(MetaBall *mb)
} }
/* most simple meta-element adding function /* most simple meta-element adding function
* dont do context menipulation here (rna uses) */ * don't do context manipulation here (rna uses) */
MetaElem *add_metaball_element(MetaBall *mb, const int type) MetaElem *add_metaball_element(MetaBall *mb, const int type)
{ {
MetaElem *ml= MEM_callocN(sizeof(MetaElem), "metaelem"); MetaElem *ml= MEM_callocN(sizeof(MetaElem), "metaelem");
@@ -237,14 +240,14 @@ MetaElem *add_metaball_element(MetaBall *mb, const int type)
/** Compute bounding box of all MetaElems/MetaBalls. /** Compute bounding box of all MetaElems/MetaBalls.
* *
* Bounding box is computed from polygonized surface. Object *ob is * Bounding box is computed from polygonized surface. Object *ob is
* basic MetaBall (usaualy with name Meta). All other MetaBalls (whith * basic MetaBall (usually with name Meta). All other MetaBalls (with
* names Meta.001, Meta.002, etc) are included in this Bounding Box. * names Meta.001, Meta.002, etc) are included in this Bounding Box.
*/ */
void tex_space_mball(Object *ob) void tex_space_mball(Object *ob)
{ {
DispList *dl; DispList *dl;
BoundBox *bb; BoundBox *bb;
float *data, min[3], max[3], loc[3], size[3]; float *data, min[3], max[3] /*, loc[3], size[3] */;
int tot, doit=0; int tot, doit=0;
if(ob->bb==NULL) ob->bb= MEM_callocN(sizeof(BoundBox), "mb boundbox"); if(ob->bb==NULL) ob->bb= MEM_callocN(sizeof(BoundBox), "mb boundbox");
@@ -272,7 +275,7 @@ void tex_space_mball(Object *ob)
min[0] = min[1] = min[2] = -1.0f; min[0] = min[1] = min[2] = -1.0f;
max[0] = max[1] = max[2] = 1.0f; max[0] = max[1] = max[2] = 1.0f;
} }
/*
loc[0]= (min[0]+max[0])/2.0f; loc[0]= (min[0]+max[0])/2.0f;
loc[1]= (min[1]+max[1])/2.0f; loc[1]= (min[1]+max[1])/2.0f;
loc[2]= (min[2]+max[2])/2.0f; loc[2]= (min[2]+max[2])/2.0f;
@@ -280,7 +283,7 @@ void tex_space_mball(Object *ob)
size[0]= (max[0]-min[0])/2.0f; size[0]= (max[0]-min[0])/2.0f;
size[1]= (max[1]-min[1])/2.0f; size[1]= (max[1]-min[1])/2.0f;
size[2]= (max[2]-min[2])/2.0f; size[2]= (max[2]-min[2])/2.0f;
*/
boundbox_set_from_min_max(bb, min, max); boundbox_set_from_min_max(bb, min, max);
} }
@@ -320,14 +323,14 @@ float *make_orco_mball(Object *ob, ListBase *dispbase)
} }
/* Note on mball basis stuff 2.5x (this is a can of worms) /* Note on mball basis stuff 2.5x (this is a can of worms)
* This really needs a rewrite/refactorm its totally broken in anything other then basic cases * This really needs a rewrite/refactor its totally broken in anything other then basic cases
* Multiple Scenes + Set Scenes & mixing mball basis SHOULD work but fails to update the depsgraph on rename * Multiple Scenes + Set Scenes & mixing mball basis SHOULD work but fails to update the depsgraph on rename
* and linking into scenes or removal of basis mball. so take care when changing this code. * and linking into scenes or removal of basis mball. so take care when changing this code.
* *
* Main idiot thing here is that the system returns find_basis_mball() objects which fail a is_basis_mball() test. * Main idiot thing here is that the system returns find_basis_mball() objects which fail a is_basis_mball() test.
* *
* Not only that but the depsgraph and ther areas depend on this behavior!, so making small fixes here isnt worth it. * Not only that but the depsgraph and their areas depend on this behavior!, so making small fixes here isn't worth it.
* - campbell * - Campbell
*/ */
@@ -725,7 +728,7 @@ void accum_mballfaces(int i1, int i2, int i3, int i4)
cur= indices+4*curindex; cur= indices+4*curindex;
/* diplists now support array drawing, we treat trias as fake quad */ /* displists now support array drawing, we treat tri's as fake quad */
cur[0]= i1; cur[0]= i1;
cur[1]= i2; cur[1]= i2;
@@ -1315,7 +1318,7 @@ void converge (MB_POINT *p1, MB_POINT *p2, float v1, float v2,
dy = pos.y - neg.y; dy = pos.y - neg.y;
dz = pos.z - neg.z; dz = pos.z - neg.z;
/* Aproximation by linear interpolation is faster then binary subdivision, /* Approximation by linear interpolation is faster then binary subdivision,
* but it results sometimes (mb->thresh < 0.2) into the strange results */ * but it results sometimes (mb->thresh < 0.2) into the strange results */
if((mb->thresh > 0.2f) && (f==1)){ if((mb->thresh > 0.2f) && (f==1)){
if((dy == 0.0f) && (dz == 0.0f)){ if((dy == 0.0f) && (dz == 0.0f)){
@@ -1373,7 +1376,7 @@ void converge (MB_POINT *p1, MB_POINT *p2, float v1, float v2,
p->x = 0.5f*(pos.x + neg.x); p->x = 0.5f*(pos.x + neg.x);
p->y = 0.5f*(pos.y + neg.y); p->y = 0.5f*(pos.y + neg.y);
p->z = 0.5f*(pos.z + neg.z); p->z = 0.5f*(pos.z + neg.z);
if (i++ == RES) return; if (i++ == RES) return;
if ((function(p->x, p->y, p->z)) > 0.0f){ if ((function(p->x, p->y, p->z)) > 0.0f){
@@ -1625,7 +1628,7 @@ float init_meta(Scene *scene, Object *ob) /* return totsize */
} }
} }
/* when metaball object hase zero scale, then MetaElem ot this MetaBall /* when metaball object has zero scale, then MetaElem to this MetaBall
* will not be put to mainb array */ * will not be put to mainb array */
if(bob->size[0]==0.0f || bob->size[1]==0.0f || bob->size[2]==0.0f) { if(bob->size[0]==0.0f || bob->size[1]==0.0f || bob->size[2]==0.0f) {
zero_size= 1; zero_size= 1;
@@ -1688,11 +1691,11 @@ float init_meta(Scene *scene, Object *ob) /* return totsize */
mul_m4_m4m4(temp2, bob->obmat, obinv); mul_m4_m4m4(temp2, bob->obmat, obinv);
/* MetaBall transformation */ /* MetaBall transformation */
mul_m4_m4m4(mat, temp1, temp2); mul_m4_m4m4(mat, temp1, temp2);
invert_m4_m4(imat,mat); invert_m4_m4(imat,mat);
mainb[a]->rad2= ml->rad*ml->rad; mainb[a]->rad2= ml->rad*ml->rad;
mainb[a]->mat= (float*) mat; mainb[a]->mat= (float*) mat;
mainb[a]->imat= (float*) imat; mainb[a]->imat= (float*) imat;

View File

@@ -236,6 +236,8 @@ Mesh *copy_mesh(Mesh *me)
} }
men->mselect= NULL; men->mselect= NULL;
men->edit_mesh= NULL;
men->pv= NULL; /* looks like this is no-longer supported but NULL just incase */
men->bb= MEM_dupallocN(men->bb); men->bb= MEM_dupallocN(men->bb);
@@ -1463,7 +1465,7 @@ void create_vert_edge_map(ListBase **map, IndexNode **mem, const MEdge *medge, c
(*map) = MEM_callocN(sizeof(ListBase) * totvert, "vert edge map"); (*map) = MEM_callocN(sizeof(ListBase) * totvert, "vert edge map");
(*mem) = MEM_callocN(sizeof(IndexNode) * totedge * 2, "vert edge map mem"); (*mem) = MEM_callocN(sizeof(IndexNode) * totedge * 2, "vert edge map mem");
node = *mem; node = *mem;
/* Find the users */ /* Find the users */
for(i = 0; i < totedge; ++i){ for(i = 0; i < totedge; ++i){
for(j = 0; j < 2; ++j, ++node) { for(j = 0; j < 2; ++j, ++node) {

View File

@@ -56,7 +56,6 @@
#include "BKE_fcurve.h" #include "BKE_fcurve.h"
#include "BKE_node.h" #include "BKE_node.h"
#include "BKE_utildefines.h" #include "BKE_utildefines.h"
#include "BKE_node.h"
#include "PIL_time.h" #include "PIL_time.h"
@@ -968,6 +967,11 @@ bNode *nodeAddNodeType(bNodeTree *ntree, int type, bNodeTree *ngroup, ID *id)
} else } else
ntype= node_get_type(ntree, type, id); ntype= node_get_type(ntree, type, id);
if(ntype == NULL) {
printf("nodeAddNodeType() error: '%d' type invalid\n", type);
return NULL;
}
node= MEM_callocN(sizeof(bNode), "new node"); node= MEM_callocN(sizeof(bNode), "new node");
BLI_addtail(&ntree->nodes, node); BLI_addtail(&ntree->nodes, node);
node->typeinfo= ntype; node->typeinfo= ntype;
@@ -1998,11 +2002,23 @@ static void node_group_execute(bNodeStack *stack, void *data, bNode *gnode, bNod
if (ntree->type==NTREE_COMPOSIT) { if (ntree->type==NTREE_COMPOSIT) {
bNodeSocket *sock; bNodeSocket *sock;
bNodeStack *ns; bNodeStack *ns;
/* clear hasoutput on all local stack data,
* only the group output will be used from now on
*/
for (node=ntree->nodes.first; node; node=node->next) {
for (sock=node->outputs.first; sock; sock=sock->next) {
if (sock->stack_type==SOCK_STACK_LOCAL) {
ns= get_socket_stack(stack, sock, in);
ns->hasoutput = 0;
}
}
}
/* use the hasoutput flag to tag external sockets */
for (sock=ntree->outputs.first; sock; sock=sock->next) { for (sock=ntree->outputs.first; sock; sock=sock->next) {
/* use the hasoutput flag to tag external sockets */
if (sock->stack_type==SOCK_STACK_LOCAL) { if (sock->stack_type==SOCK_STACK_LOCAL) {
ns= get_socket_stack(stack, sock, in); ns= get_socket_stack(stack, sock, in);
ns->hasoutput = 0; ns->hasoutput = 1;
} }
} }
/* now free all stacks that are not used from outside */ /* now free all stacks that are not used from outside */
@@ -2010,11 +2026,9 @@ static void node_group_execute(bNodeStack *stack, void *data, bNode *gnode, bNod
for (sock=node->outputs.first; sock; sock=sock->next) { for (sock=node->outputs.first; sock; sock=sock->next) {
if (sock->stack_type==SOCK_STACK_LOCAL ) { if (sock->stack_type==SOCK_STACK_LOCAL ) {
ns= get_socket_stack(stack, sock, in); ns= get_socket_stack(stack, sock, in);
if (ns->hasoutput!=0 && ns->data) { if (ns->hasoutput==0 && ns->data) {
free_compbuf(ns->data); free_compbuf(ns->data);
ns->data = NULL; ns->data = NULL;
/* reset the flag */
ns->hasoutput = 1;
} }
} }
} }
@@ -2236,6 +2250,10 @@ static void group_tag_used_outputs(bNode *gnode, bNodeStack *stack, bNodeStack *
if (ns) if (ns)
ns->sockettype = sock->type; ns->sockettype = sock->type;
} }
/* non-composite trees do all nodes by default */
if (ntree->type!=NTREE_COMPOSIT)
node->need_exec = 1;
} }
} }
@@ -2321,7 +2339,7 @@ void ntreeBeginExecTree(bNodeTree *ntree)
for(node= ntree->nodes.first; node; node= node->next) { for(node= ntree->nodes.first; node; node= node->next) {
bNodeSocket *sock; bNodeSocket *sock;
/* composite has own need_exec tag handling */ /* non-composite trees do all nodes by default */
if(ntree->type!=NTREE_COMPOSIT) if(ntree->type!=NTREE_COMPOSIT)
node->need_exec= 1; node->need_exec= 1;

Some files were not shown because too many files have changed in this diff Show More