Revision: 41206
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41206
Author: blendix
Date: 2011-10-22 19:06:41 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
Cycles: svn merge -r41182:41205 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41182
Modified Paths:
--------------
branches/cycles/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/cycles/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/cycles/intern/ghost/test/multitest/MultiTest.c
branches/cycles/intern/memutil/MEM_SmartPtr.h
branches/cycles/release/datafiles/splash.png
branches/cycles/source/blender/blenfont/intern/blf_dir.c
branches/cycles/source/blender/blenfont/intern/blf_translation.c
branches/cycles/source/blender/blenkernel/BKE_bvhutils.h
branches/cycles/source/blender/blenkernel/intern/DerivedMesh.c
branches/cycles/source/blender/blenkernel/intern/blender.c
branches/cycles/source/blender/blenkernel/intern/bvhutils.c
branches/cycles/source/blender/blenkernel/intern/cloth.c
branches/cycles/source/blender/blenkernel/intern/constraint.c
branches/cycles/source/blender/blenkernel/intern/customdata.c
branches/cycles/source/blender/blenkernel/intern/effect.c
branches/cycles/source/blender/blenkernel/intern/fluidsim.c
branches/cycles/source/blender/blenkernel/intern/modifier.c
branches/cycles/source/blender/blenkernel/intern/packedFile.c
branches/cycles/source/blender/blenkernel/intern/particle.c
branches/cycles/source/blender/blenkernel/intern/particle_system.c
branches/cycles/source/blender/blenkernel/intern/pointcache.c
branches/cycles/source/blender/blenkernel/intern/sequencer.c
branches/cycles/source/blender/blenkernel/intern/subsurf_ccg.c
branches/cycles/source/blender/blenlib/BLI_blenlib.h
branches/cycles/source/blender/blenlib/BLI_edgehash.h
branches/cycles/source/blender/blenlib/BLI_fileops.h
branches/cycles/source/blender/blenlib/BLI_mempool.h
branches/cycles/source/blender/blenlib/BLI_path_util.h
branches/cycles/source/blender/blenlib/BLI_scanfill.h
branches/cycles/source/blender/blenlib/BLI_utildefines.h
branches/cycles/source/blender/blenlib/CMakeLists.txt
branches/cycles/source/blender/blenlib/intern/fileops.c
branches/cycles/source/blender/blenlib/intern/path_util.c
branches/cycles/source/blender/blenloader/intern/readblenentry.c
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/blenloader/intern/runtime.c
branches/cycles/source/blender/blenloader/intern/writefile.c
branches/cycles/source/blender/collada/ImageExporter.cpp
branches/cycles/source/blender/collada/collada.cpp
branches/cycles/source/blender/editors/animation/anim_ipo_utils.c
branches/cycles/source/blender/editors/datafiles/splash.png.c
branches/cycles/source/blender/editors/interface/interface.c
branches/cycles/source/blender/editors/interface/interface_handlers.c
branches/cycles/source/blender/editors/interface/interface_icons.c
branches/cycles/source/blender/editors/interface/interface_layout.c
branches/cycles/source/blender/editors/interface/interface_panel.c
branches/cycles/source/blender/editors/interface/interface_templates.c
branches/cycles/source/blender/editors/mesh/mesh_navmesh.c
branches/cycles/source/blender/editors/physics/particle_edit.c
branches/cycles/source/blender/editors/physics/physics_fluid.c
branches/cycles/source/blender/editors/render/render_shading.c
branches/cycles/source/blender/editors/space_buttons/buttons_context.c
branches/cycles/source/blender/editors/space_buttons/buttons_ops.c
branches/cycles/source/blender/editors/space_file/file_draw.c
branches/cycles/source/blender/editors/space_file/file_ops.c
branches/cycles/source/blender/editors/space_file/filelist.c
branches/cycles/source/blender/editors/space_file/filesel.c
branches/cycles/source/blender/editors/space_file/fsmenu.c
branches/cycles/source/blender/editors/space_file/space_file.c
branches/cycles/source/blender/editors/space_image/image_ops.c
branches/cycles/source/blender/editors/space_node/node_edit.c
branches/cycles/source/blender/editors/space_outliner/outliner_edit.c
branches/cycles/source/blender/editors/space_outliner/outliner_tree.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_add.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_edit.c
branches/cycles/source/blender/editors/space_sequencer/space_sequencer.c
branches/cycles/source/blender/editors/transform/transform.c
branches/cycles/source/blender/imbuf/intern/IMB_anim.h
branches/cycles/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/cycles/source/blender/imbuf/intern/readimage.c
branches/cycles/source/blender/imbuf/intern/thumbs.c
branches/cycles/source/blender/makesrna/RNA_access.h
branches/cycles/source/blender/makesrna/intern/rna_access.c
branches/cycles/source/blender/makesrna/intern/rna_armature_api.c
branches/cycles/source/blender/makesrna/intern/rna_fcurve_api.c
branches/cycles/source/blender/makesrna/intern/rna_fluidsim.c
branches/cycles/source/blender/makesrna/intern/rna_gpencil.c
branches/cycles/source/blender/makesrna/intern/rna_object_force.c
branches/cycles/source/blender/makesrna/intern/rna_particle.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/modifiers/intern/MOD_edgesplit.c
branches/cycles/source/blender/nodes/composite/node_composite_util.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/cycles/source/blender/python/generic/IDProp.c
branches/cycles/source/blender/python/generic/py_capi_utils.c
branches/cycles/source/blender/python/generic/py_capi_utils.h
branches/cycles/source/blender/python/intern/bpy_interface.c
branches/cycles/source/blender/python/intern/bpy_rna.c
branches/cycles/source/blender/render/intern/source/pipeline.c
branches/cycles/source/blender/windowmanager/WM_types.h
branches/cycles/source/blender/windowmanager/intern/wm_event_system.c
branches/cycles/source/blender/windowmanager/intern/wm_files.c
branches/cycles/source/blender/windowmanager/intern/wm_keymap.c
branches/cycles/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/cycles/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/cycles/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/cycles/source/gameengine/VideoTexture/VideoFFmpeg.cpp
Added Paths:
-----------
branches/cycles/source/blender/blenlib/BLI_fileops_types.h
branches/cycles/source/blender/blenlib/intern/storage.c
Removed Paths:
-------------
branches/cycles/source/blender/blenlib/BLI_storage.h
branches/cycles/source/blender/blenlib/BLI_storage_types.h
branches/cycles/source/blender/blenlib/intern/storage.c
Property Changed:
----------------
branches/cycles/
branches/cycles/intern/
branches/cycles/release/
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/space_outliner/
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-40411,40935-41182
+ /trunk:37695-37700
/trunk/blender:36353-40411,40935-41205
Property changes on: branches/cycles/intern
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/intern:36353-41182
/trunk/intern:37695-37700
+ /trunk/blender/intern:36353-41205
/trunk/intern:37695-37700
Modified: branches/cycles/intern/audaspace/intern/AUD_SequencerReader.cpp
===================================================================
--- branches/cycles/intern/audaspace/intern/AUD_SequencerReader.cpp
2011-10-22 18:54:57 UTC (rev 41205)
+++ branches/cycles/intern/audaspace/intern/AUD_SequencerReader.cpp
2011-10-22 19:06:41 UTC (rev 41206)
@@ -107,8 +107,14 @@
if(result < 0)
{
- handle = new AUD_SequencerHandle(entry,
m_device);
- handles.push_front(handle);
+ try
+ {
+ handle = new AUD_SequencerHandle(entry,
m_device);
+ handles.push_front(handle);
+ }
+ catch(AUD_Exception&)
+ {
+ }
eit++;
}
else if(result == 0)
Modified: branches/cycles/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/cycles/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-10-22
18:54:57 UTC (rev 41205)
+++ branches/cycles/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-10-22
19:06:41 UTC (rev 41206)
@@ -1655,15 +1655,8 @@
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'};
+ ascii = 0;
switch ([event type]) {
@@ -1678,32 +1671,18 @@
keyCode = convertKey([event keyCode],0,
[event
type] == NSKeyDown?kUCKeyActionDown:kUCKeyActionUp);
- /* ascii */
+ /* handling both unicode or ascii */
characters = [event characters];
- if ([characters length]>0) { //Check for dead keys
- //Convert characters to iso latin 1 encoding
- convertedCharacters = [characters
dataUsingEncoding:NSISOLatin1StringEncoding];
- if ([convertedCharacters length]>0)
- ascii =((char*)[convertedCharacters
bytes])[0];
- else
- ascii = 0; //Character not available in
iso latin 1 encoding
- }
- 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];
+
+ for (int x = 0; x < [convertedCharacters
length]; x++) {
+ utf8_buf[x] =
((char*)[convertedCharacters bytes])[x];
}
- else {
- utf8_buf[0] = '\0';
+
+ /* ascii is a subset of unicode */
+ if ([convertedCharacters length] == 1) {
+ ascii = utf8_buf[0];
}
}
@@ -1714,9 +1693,7 @@
pushEvent( new GHOST_EventKey([event
timestamp]*1000, GHOST_kEventKeyDown, window, keyCode, ascii, utf8_buf) );
//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 {
- // XXX Font Object bug - backspace or adding new chars
are being computed twice (keydown and keyup)
- utf8_buf[0] = '\0';
- pushEvent( new GHOST_EventKey([event
timestamp]*1000, GHOST_kEventKeyUp, window, keyCode, ascii, utf8_buf) );
+ pushEvent( new GHOST_EventKey([event
timestamp]*1000, GHOST_kEventKeyUp, window, keyCode, 0, '\0') );
//printf("Key up 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/cycles/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/cycles/intern/ghost/intern/GHOST_SystemWin32.cpp 2011-10-22
18:54:57 UTC (rev 41205)
+++ branches/cycles/intern/ghost/intern/GHOST_SystemWin32.cpp 2011-10-22
19:06:41 UTC (rev 41206)
@@ -725,6 +725,8 @@
(wchar_t*)utf16, 1,
(LPSTR)
utf8_char, 5,
NULL,NULL); else *utf8_char = 0;
+
+ if(!keyDown) utf8_char[0] = '\0';
event = new GHOST_EventKey(system->getMilliSeconds(), keyDown ?
GHOST_kEventKeyDown: GHOST_kEventKeyUp, window, key, (*utf8_char &
0x80)?'?':*utf8_char, utf8_char);
Modified: branches/cycles/intern/ghost/test/multitest/MultiTest.c
===================================================================
--- branches/cycles/intern/ghost/test/multitest/MultiTest.c 2011-10-22
18:54:57 UTC (rev 41205)
+++ branches/cycles/intern/ghost/test/multitest/MultiTest.c 2011-10-22
19:06:41 UTC (rev 41206)
@@ -50,9 +50,8 @@
extern int datatoc_bfont_ttf_size;
extern char datatoc_bfont_ttf[];
- // XXX, bad, but BLI uses these
- char bprogname[160]= "";
-char U[1024]= {0};
+ /* cheat */
+ char U[1024]= {0};
#endif
#include "Util.h"
Modified: branches/cycles/intern/memutil/MEM_SmartPtr.h
===================================================================
--- branches/cycles/intern/memutil/MEM_SmartPtr.h 2011-10-22 18:54:57 UTC
(rev 41205)
+++ branches/cycles/intern/memutil/MEM_SmartPtr.h 2011-10-22 19:06:41 UTC
(rev 41206)
@@ -49,14 +49,14 @@
* the Standard Template Library but without the painful get()
* semantics to access the internal c style pointer.
*
- * It is often useful to explicitely decalre ownership of memory
+ * It is often useful to explicitly declare ownership of memory
* allocated on the heap within class or function scope. This
* class helps you to encapsulate this ownership within a value
* type. When an instance of this class goes out of scope it
* makes sure that any memory associated with it's internal pointer
* is deleted. It can help to inform users of an aggregate class
* that it owns instances of it's members and these instances
- * should not be shared. This is not reliably enforcable in C++
+ * should not be shared. This is not reliably enforceable in C++
* but this class attempts to make the 1-1 relationship clear.
*
* @section Example usage
Property changes on: branches/cycles/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:36353-41182
/trunk/release:37695-37700
+ /trunk/blender/release:36353-41205
/trunk/release:37695-37700
Modified: branches/cycles/release/datafiles/splash.png
===================================================================
(Binary files differ)
Modified: branches/cycles/source/blender/blenfont/intern/blf_dir.c
===================================================================
--- branches/cycles/source/blender/blenfont/intern/blf_dir.c 2011-10-22
18:54:57 UTC (rev 41205)
+++ branches/cycles/source/blender/blenfont/intern/blf_dir.c 2011-10-22
19:06:41 UTC (rev 41206)
@@ -136,7 +136,7 @@
for(dir=global_font_dir.first; dir; dir= dir->next) {
BLI_join_dirfile(full_path, sizeof(full_path), dir->path, file);
- if (BLI_exist(full_path)) {
+ if (BLI_exists(full_path)) {
s= BLI_strdup(full_path);
break;
}
@@ -144,7 +144,7 @@
if (!s) {
/* check the current directory, why not ? */
- if (BLI_exist(file))
+ if (BLI_exists(file))
s= BLI_strdup(file);
}
@@ -198,13 +198,13 @@
s[2]= 'm';
/* first check .afm */
- if (BLI_exist(s))
+ if (BLI_exists(s))
return s;
/* and now check .pfm */
s[0]= 'p';
- if (BLI_exist(s))
+ if (BLI_exists(s))
return s;
}
MEM_freeN(mfile);
Modified: branches/cycles/source/blender/blenfont/intern/blf_translation.c
===================================================================
--- branches/cycles/source/blender/blenfont/intern/blf_translation.c
2011-10-22 18:54:57 UTC (rev 41205)
+++ branches/cycles/source/blender/blenfont/intern/blf_translation.c
2011-10-22 19:06:41 UTC (rev 41206)
@@ -60,7 +60,7 @@
BLI_snprintf(unifont_path, sizeof(unifont_path),
"%s/%s", fontpath, unifont_filename);
- unifont_ttf= (unsigned
char*)BLI_ungzip_to_mem(unifont_path, &unifont_size);
+ unifont_ttf= (unsigned
char*)BLI_file_ungzip_to_mem(unifont_path, &unifont_size);
}
else {
printf("%s: 'fonts' data path not found for
international font, continuing\n", __func__);
Modified: branches/cycles/source/blender/blenkernel/BKE_bvhutils.h
===================================================================
--- branches/cycles/source/blender/blenkernel/BKE_bvhutils.h 2011-10-22
18:54:57 UTC (rev 41205)
+++ branches/cycles/source/blender/blenkernel/BKE_bvhutils.h 2011-10-22
19:06:41 UTC (rev 41206)
@@ -34,7 +34,6 @@
*/
#include "BLI_kdopbvh.h"
-#include "BLI_linklist.h"
/*
* This header encapsulates necessary code to buld a BVH
@@ -118,7 +117,7 @@
#define BVHTREE_FROM_VERTICES 1
#define BVHTREE_FROM_EDGES 2
-typedef LinkNode* BVHCache;
+typedef struct LinkNode* BVHCache;
/*
Modified: branches/cycles/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/cycles/source/blender/blenkernel/intern/DerivedMesh.c
2011-10-22 18:54:57 UTC (rev 41205)
+++ branches/cycles/source/blender/blenkernel/intern/DerivedMesh.c
2011-10-22 19:06:41 UTC (rev 41206)
@@ -50,6 +50,7 @@
#include "BLI_memarena.h"
#include "BLI_pbvh.h"
#include "BLI_utildefines.h"
+#include "BLI_linklist.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
Modified: branches/cycles/source/blender/blenkernel/intern/blender.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
