[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50478] branches/soc-2011-tomato: Merging r50470 through r50477 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Sat Sep 8 12:17:43 CEST 2012
Revision: 50478
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50478
Author: nazgul
Date: 2012-09-08 10:17:42 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
Merging r50470 through r50477 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50470
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50477
Modified Paths:
--------------
branches/soc-2011-tomato/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2011-tomato/intern/ghost/test/multitest/EventToBuf.c
branches/soc-2011-tomato/intern/ghost/test/multitest/MultiTest.c
branches/soc-2011-tomato/intern/utfconv/utf_winfunc.c
branches/soc-2011-tomato/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_base.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_utils.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_stats.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_relationships.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-tomato/source/blender/python/generic/bgl.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/darwin/blender.app/Contents/Info.plist
branches/soc-2011-tomato/source/darwin/blenderplayer.app/Contents/Info.plist
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/intern/cycles/kernel/kernel_attribute.h
branches/soc-2011-tomato/intern/cycles/util/util_attribute.cpp
branches/soc-2011-tomato/intern/cycles/util/util_attribute.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50469
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50477
Property changes on: branches/soc-2011-tomato/intern/cycles/kernel/kernel_attribute.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2011-tomato/intern/cycles/util/util_attribute.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2011-tomato/intern/cycles/util/util_attribute.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_C-api.cpp 2012-09-08 08:59:47 UTC (rev 50477)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_C-api.cpp 2012-09-08 10:17:42 UTC (rev 50478)
@@ -529,7 +529,10 @@
char *ctitle = (char *) malloc(title.Length() + 1);
- if (ctitle == NULL) return NULL;
+ if (ctitle == NULL) {
+ return NULL;
+ }
+
strcpy(ctitle, title.Ptr());
return ctitle;
Modified: branches/soc-2011-tomato/intern/ghost/test/multitest/EventToBuf.c
===================================================================
--- branches/soc-2011-tomato/intern/ghost/test/multitest/EventToBuf.c 2012-09-08 08:59:47 UTC (rev 50477)
+++ branches/soc-2011-tomato/intern/ghost/test/multitest/EventToBuf.c 2012-09-08 10:17:42 UTC (rev 50478)
@@ -203,33 +203,36 @@
void *data= GHOST_GetEventData(evt);
char *pos= buf;
- pos+= sprintf(pos, "event: %6.2f, %16s", time, eventtype_to_string(type));
+ pos += sprintf(pos, "event: %6.2f, %16s", time, eventtype_to_string(type));
if (win) {
char *s= GHOST_GetTitle(win);
- pos+= sprintf(pos, " - win: %s", s);
+ pos += sprintf(pos, " - win: %s", s);
free(s);
} else {
pos+= sprintf(pos, " - sys evt");
}
switch (type) {
- case GHOST_kEventCursorMove: {
- GHOST_TEventCursorData *cd= data;
- pos+= sprintf(pos, " - pos: (%d, %d)", cd->x, cd->y);
- break;
+ case GHOST_kEventCursorMove:
+ {
+ GHOST_TEventCursorData *cd= data;
+ pos += sprintf(pos, " - pos: (%d, %d)", cd->x, cd->y);
+ break;
+ }
+ case GHOST_kEventButtonDown:
+ case GHOST_kEventButtonUp:
+ {
+ GHOST_TEventButtonData *bd= data;
+ pos += sprintf(pos, " - but: %d", bd->button);
+ break;
+ }
+
+ case GHOST_kEventKeyDown:
+ case GHOST_kEventKeyUp:
+ {
+ GHOST_TEventKeyData *kd= data;
+ pos += sprintf(pos, " - key: %s (%d)", keytype_to_string(kd->key), kd->key);
+ if (kd->ascii) pos+= sprintf(pos, " ascii: '%c' (%d)", kd->ascii, kd->ascii);
+ break;
+ }
}
- case GHOST_kEventButtonDown:
- case GHOST_kEventButtonUp: {
- GHOST_TEventButtonData *bd= data;
- pos+= sprintf(pos, " - but: %d", bd->button);
- break;
- }
-
- case GHOST_kEventKeyDown:
- case GHOST_kEventKeyUp: {
- GHOST_TEventKeyData *kd= data;
- pos+= sprintf(pos, " - key: %s (%d)", keytype_to_string(kd->key), kd->key);
- if (kd->ascii) pos+= sprintf(pos, " ascii: '%c' (%d)", kd->ascii, kd->ascii);
- break;
- }
- }
}
Modified: branches/soc-2011-tomato/intern/ghost/test/multitest/MultiTest.c
===================================================================
--- branches/soc-2011-tomato/intern/ghost/test/multitest/MultiTest.c 2012-09-08 08:59:47 UTC (rev 50477)
+++ branches/soc-2011-tomato/intern/ghost/test/multitest/MultiTest.c 2012-09-08 10:17:42 UTC (rev 50478)
@@ -267,7 +267,8 @@
mainwindow_log(mw, buf);
switch (type) {
- case GHOST_kEventCursorMove: {
+ case GHOST_kEventCursorMove:
+ {
GHOST_TEventCursorData *cd = GHOST_GetEventData(evt);
int x, y;
GHOST_ScreenToClient(mw->win, cd->x, cd->y, &x, &y);
@@ -275,13 +276,15 @@
break;
}
case GHOST_kEventButtonDown:
- case GHOST_kEventButtonUp: {
+ case GHOST_kEventButtonUp:
+ {
GHOST_TEventButtonData *bd = GHOST_GetEventData(evt);
mainwindow_do_button(mw, bd->button, (type == GHOST_kEventButtonDown));
break;
}
case GHOST_kEventKeyDown:
- case GHOST_kEventKeyUp: {
+ case GHOST_kEventKeyUp:
+ {
GHOST_TEventKeyData *kd = GHOST_GetEventData(evt);
mainwindow_do_key(mw, kd->key, (type == GHOST_kEventKeyDown));
break;
@@ -541,7 +544,8 @@
GHOST_TEventType type = GHOST_GetEventType(evt);
switch (type) {
- case GHOST_kEventCursorMove: {
+ case GHOST_kEventCursorMove:
+ {
GHOST_TEventCursorData *cd = GHOST_GetEventData(evt);
int x, y;
GHOST_ScreenToClient(lw->win, cd->x, cd->y, &x, &y);
@@ -549,13 +553,15 @@
break;
}
case GHOST_kEventButtonDown:
- case GHOST_kEventButtonUp: {
+ case GHOST_kEventButtonUp:
+ {
GHOST_TEventButtonData *bd = GHOST_GetEventData(evt);
loggerwindow_do_button(lw, bd->button, (type == GHOST_kEventButtonDown));
break;
}
case GHOST_kEventKeyDown:
- case GHOST_kEventKeyUp: {
+ case GHOST_kEventKeyUp:
+ {
GHOST_TEventKeyData *kd = GHOST_GetEventData(evt);
loggerwindow_do_key(lw, kd->key, (type == GHOST_kEventKeyDown));
break;
@@ -743,13 +749,15 @@
switch (type) {
case GHOST_kEventKeyDown:
- case GHOST_kEventKeyUp: {
+ case GHOST_kEventKeyUp:
+ {
GHOST_TEventKeyData *kd = GHOST_GetEventData(evt);
extrawindow_do_key(ew, kd->key, (type == GHOST_kEventKeyDown));
break;
}
- case GHOST_kEventCursorMove: {
+ case GHOST_kEventCursorMove:
+ {
extrawindow_spin_cursor(ew, GHOST_GetEventTime(evt));
break;
}
Modified: branches/soc-2011-tomato/intern/utfconv/utf_winfunc.c
===================================================================
--- branches/soc-2011-tomato/intern/utfconv/utf_winfunc.c 2012-09-08 08:59:47 UTC (rev 50477)
+++ branches/soc-2011-tomato/intern/utfconv/utf_winfunc.c 2012-09-08 10:17:42 UTC (rev 50478)
@@ -37,7 +37,7 @@
{
FILE *f = NULL;
UTF16_ENCODE(filename);
- UTF16_ENCODE (mode);
+ UTF16_ENCODE(mode);
if (filename_16 && mode_16) {
f = _wfopen(filename_16, mode_16);
@@ -79,9 +79,11 @@
{
int r = -1;
UTF16_ENCODE(oldname);
- UTF16_ENCODE (newname);
+ UTF16_ENCODE(newname);
- if (oldname_16 && newname_16) r = _wrename(oldname_16, newname_16);
+ if (oldname_16 && newname_16) {
+ r = _wrename(oldname_16, newname_16);
+ }
UTF16_UN_ENCODE(newname);
UTF16_UN_ENCODE(oldname);
@@ -94,7 +96,9 @@
BOOL r = 0;
UTF16_ENCODE(pathname);
- if (pathname_16) r = CreateDirectoryW(pathname_16, NULL);
+ if (pathname_16) {
+ r = CreateDirectoryW(pathname_16, NULL);
+ }
UTF16_UN_ENCODE(pathname);
@@ -123,8 +127,11 @@
{
int r = 0;
wchar_t * str;
- if (!buffsize) return r;
+ if (!buffsize) {
+ return r;
+ }
+
UTF16_ENCODE(varname);
if (varname_16) {
str = _wgetenv(varname_16);
@@ -133,7 +140,9 @@
}
UTF16_UN_ENCODE(varname);
- if (!r) value[0] = 0;
+ if (!r) {
+ value[0] = 0;
+ }
return r;
}
@@ -143,6 +152,7 @@
int r = -1;
UTF16_ENCODE(name);
UTF16_ENCODE(value);
+
if (name_16 && value_16) {
r = (SetEnvironmentVariableW(name_16,value_16)!= 0) ? 0 : -1;
}
Modified: branches/soc-2011-tomato/release/datafiles/fonts/droidsans.ttf.gz
===================================================================
(Binary files differ)
Modified: branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c 2012-09-08 08:59:47 UTC (rev 50477)
+++ branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c 2012-09-08 10:17:42 UTC (rev 50478)
@@ -108,6 +108,7 @@
"turkish", "tr_TR",
"hungarian", "hu_HU",
"brazilian portuguese", "pt_BR",
+ "hebrew", "he_IL",
};
void BLF_lang_init(void)
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c 2012-09-08 08:59:47 UTC (rev 50477)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c 2012-09-08 10:17:42 UTC (rev 50478)
@@ -193,7 +193,7 @@
DO_INLINE void del_lfvector(float (*fLongVector)[3])
{
if (fLongVector != NULL) {
- MEM_freeN (fLongVector);
+ MEM_freeN(fLongVector);
// cloth_aligned_free(&MEMORY_BASE, fLongVector);
}
}
@@ -523,7 +523,7 @@
DO_INLINE void del_bfmatrix(fmatrix3x3 *matrix)
{
if (matrix != NULL) {
- MEM_freeN (matrix);
+ MEM_freeN(matrix);
}
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c 2012-09-08 08:59:47 UTC (rev 50477)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c 2012-09-08 10:17:42 UTC (rev 50478)
@@ -1684,7 +1684,8 @@
printf("%c%c%c", text->undo_buf[i], text->undo_buf[i + 1], text->undo_buf[i + 2]);
i += 3;
break;
- case UNDO_INSERT_4: case UNDO_BS_4: case UNDO_DEL_4: {
+ case UNDO_INSERT_4: case UNDO_BS_4: case UNDO_DEL_4:
+ {
unsigned int uc;
char c[BLI_UTF8_MAX + 1];
size_t c_len;
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c 2012-09-08 08:59:47 UTC (rev 50477)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c 2012-09-08 10:17:42 UTC (rev 50478)
@@ -177,58 +177,71 @@
static const char **get_file_extensions(int format)
{
switch (format) {
- case FFMPEG_DV: {
+ case FFMPEG_DV:
+ {
static const char *rv[] = { ".dv", NULL };
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list