[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41158] branches/soc-2011-tomato: Merging r41140 through r41157 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Thu Oct 20 22:24:04 CEST 2011
Revision: 41158
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41158
Author: nazgul
Date: 2011-10-20 20:24:04 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Merging r41140 through r41157 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41140
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41157
Modified Paths:
--------------
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_font.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_conversions.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_eulers.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_structure.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/nla.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_blenlib.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_string.h
branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_args.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/blenlib/intern/string_utf8.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-tomato/source/blender/editors/curve/editfont.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_anim.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2011-tomato/source/blender/editors/space_file/fsmenu.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_socket.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_operator.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/blenlib/BLI_string_utf8.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41139
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41157
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-10-20 20:24:04 UTC (rev 41158)
@@ -1654,8 +1654,17 @@
//printf("\nW failure for event 0x%x",[event type]);
return GHOST_kFailure;
}
+
+ /* unicode input - not entirely supported yet
+ * but we are getting the right byte, Blender is not drawing it though
+ * also some languages may need special treatment:
+ - Japanese: romanji is used as input, and every 2 letters OSX converts the text
+ to Hiragana/Katakana.
+ - Korean: one add one letter at a time, and then the OSX join them in the equivalent
+ combined letter.
+ */
+ char utf8_buf[6]= {'\0'};
- char utf8_buf[6]= {'\0'}; /* TODO, unicode input */
switch ([event type]) {
case NSKeyDown:
@@ -1669,7 +1678,7 @@
keyCode = convertKey([event keyCode],0,
[event type] == NSKeyDown?kUCKeyActionDown:kUCKeyActionUp);
-
+ /* ascii */
characters = [event characters];
if ([characters length]>0) { //Check for dead keys
//Convert characters to iso latin 1 encoding
@@ -1681,16 +1690,32 @@
}
else
ascii= 0;
+
+ /* unicode */
+ if ([characters length]>0) {
+ convertedCharacters = [characters dataUsingEncoding:NSUTF8StringEncoding];
+ if ([convertedCharacters length]>0) {
+ utf8_buf[0] = ((char*)[convertedCharacters bytes])[0];
+ utf8_buf[1] = ((char*)[convertedCharacters bytes])[1];
+ utf8_buf[2] = ((char*)[convertedCharacters bytes])[2];
+ utf8_buf[3] = ((char*)[convertedCharacters bytes])[3];
+ utf8_buf[4] = ((char*)[convertedCharacters bytes])[4];
+ utf8_buf[5] = ((char*)[convertedCharacters bytes])[5];
+ }
+ else {
+ utf8_buf[0] = '\0';
+ }
+ }
if ((keyCode == GHOST_kKeyQ) && (m_modifierMask & NSCommandKeyMask))
break; //Cmd-Q is directly handled by Cocoa
if ([event type] == NSKeyDown) {
pushEvent( new GHOST_EventKey([event timestamp]*1000, GHOST_kEventKeyDown, window, keyCode, ascii, utf8_buf) );
- //printf("\nKey down rawCode=0x%x charsIgnoringModifiers=%c keyCode=%u ascii=%i %c",[event keyCode],[charsIgnoringModifiers length]>0?[charsIgnoringModifiers characterAtIndex:0]:' ',keyCode,ascii,ascii);
+ //printf("Key down rawCode=0x%x charsIgnoringModifiers=%c keyCode=%u ascii=%i %c utf8=%s\n",[event keyCode],[charsIgnoringModifiers length]>0?[charsIgnoringModifiers characterAtIndex:0]:' ',keyCode,ascii,ascii, utf8_buf);
} else {
pushEvent( new GHOST_EventKey([event timestamp]*1000, GHOST_kEventKeyUp, window, keyCode, ascii, utf8_buf) );
- //printf("\nKey up rawCode=0x%x charsIgnoringModifiers=%c keyCode=%u ascii=%i %c",[event keyCode],[charsIgnoringModifiers length]>0?[charsIgnoringModifiers characterAtIndex:0]:' ',keyCode,ascii,ascii);
+ //printf("Key down rawCode=0x%x charsIgnoringModifiers=%c keyCode=%u ascii=%i %c utf8=%s\n",[event keyCode],[charsIgnoringModifiers length]>0?[charsIgnoringModifiers characterAtIndex:0]:' ',keyCode,ascii,ascii, utf8_buf);
}
break;
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-10-20 20:24:04 UTC (rev 41158)
@@ -665,7 +665,7 @@
split = layout.split()
col = split.column()
col.label(text="Texture:")
- col.prop(md, "texture", text="")
+ col.template_ID(md, "texture", new="texture.new")
col = split.column()
col.label(text="Texture Coordinates:")
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py 2011-10-20 20:24:04 UTC (rev 41158)
@@ -61,6 +61,10 @@
split = layout.split(percentage=0.2)
split.label(text="Shape:")
split.prop(field, "shape", text="")
+ elif field.type == 'TEXTURE':
+ split = layout.split(percentage=0.2)
+ split.label(text="Texture:")
+ split.row().template_ID(field, "texture", new="texture.new")
split = layout.split()
@@ -103,7 +107,6 @@
elif field.type == 'TEXTURE':
col = split.column()
col.prop(field, "strength")
- col.prop(field, "texture", text="")
col.prop(field, "texture_mode", text="")
col.prop(field, "texture_nabla")
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2011-10-20 20:24:04 UTC (rev 41158)
@@ -53,7 +53,7 @@
/* can be left blank, otherwise a,b,c... etc with no quotes */
#define BLENDER_VERSION_CHAR
/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE release
+#define BLENDER_VERSION_CYCLE alpha
struct ListBase;
struct MemFile;
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_font.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_font.h 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_font.h 2011-10-20 20:24:04 UTC (rev 41158)
@@ -85,11 +85,6 @@
int BKE_font_getselection(struct Object *ob, int *start, int *end);
-size_t chtoutf8(const unsigned long c, char o[4]);
-void wcs2utf8s(char *dst, const wchar_t *src);
-size_t wcsleninu8(wchar_t *src);
-size_t utf8towchar(wchar_t *w, const char *c);
-
#ifdef __cplusplus
}
#endif
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_conversions.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_conversions.c 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_conversions.c 2011-10-20 20:24:04 UTC (rev 41158)
@@ -44,6 +44,7 @@
#include "DNA_scene_types.h"
#include "BLI_edgehash.h"
+#include "BLI_listbase.h"
#include "BLI_utildefines.h"
#include "BKE_mesh.h"
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_eulers.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_eulers.c 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_eulers.c 2011-10-20 20:24:04 UTC (rev 41158)
@@ -38,6 +38,7 @@
#include "MEM_guardedalloc.h"
+#include "BLI_listbase.h"
#include "BLI_utildefines.h"
#include "bmesh_private.h"
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_mesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_mesh.c 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_mesh.c 2011-10-20 20:24:04 UTC (rev 41158)
@@ -37,7 +37,7 @@
*/
-
+#include "BLI_listbase.h"
#include "MEM_guardedalloc.h"
#include "BKE_bmesh.h"
#include "bmesh_private.h"
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_structure.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_structure.c 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_structure.c 2011-10-20 20:24:04 UTC (rev 41158)
@@ -40,6 +40,7 @@
#include <limits.h>
#include "MEM_guardedalloc.h"
+#include "BLI_listbase.h"
#include "BLI_utildefines.h"
#include "BKE_bmesh.h"
/**
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c 2011-10-20 20:24:04 UTC (rev 41158)
@@ -38,6 +38,7 @@
#include "BLI_winstuff.h"
#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
#include "BLI_ghash.h"
#include "DNA_anim_types.h"
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c 2011-10-20 17:55:50 UTC (rev 41157)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c 2011-10-20 20:24:04 UTC (rev 41158)
@@ -64,142 +64,6 @@
static ListBase ttfdata= {NULL, NULL};
-/* UTF-8 <-> wchar transformations */
-size_t chtoutf8(const unsigned long c, char o[4])
-{
- // Variables and initialization
-/* memset(o, 0, 4); */
-
- // Create the utf-8 string
- if (c < 0x80) {
- o[0] = (char) c;
- return 1;
- }
- else if (c < 0x800) {
- o[0] = (0xC0 | (c>>6));
- o[1] = (0x80 | (c & 0x3f));
- return 2;
- }
- else if (c < 0x10000) {
- o[0] = (0xe0 | (c >> 12));
- o[1] = (0x80 | (c >>6 & 0x3f));
- o[2] = (0x80 | (c & 0x3f));
- return 3;
- }
- else if (c < 0x200000) {
- o[0] = (0xf0 | (c>>18));
- o[1] = (0x80 | (c >>12 & 0x3f));
- o[2] = (0x80 | (c >> 6 & 0x3f));
- o[3] = (0x80 | (c & 0x3f));
- return 4;
- }
-
- /* should we assert here? */
- return 0;
-}
-
-void wcs2utf8s(char *dst, const wchar_t *src)
-{
- while(*src) {
- dst += chtoutf8(*src++, dst);
- }
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list