Revision: 14678
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14678
Author: genscher
Date: 2008-05-04 16:14:54 +0200 (Sun, 04 May 2008)
Log Message:
-----------
svn merge -r 14649:14676
https://svn.blender.org/svnroot/bf-blender/trunk/blender (sorry - forgot half
of the commits last time)
Modified Paths:
--------------
branches/fluidcontrol/config/darwin-config.py
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/fluidcontrol/release/scripts/console.py
branches/fluidcontrol/release/scripts/wizard_curve2tree.py
branches/fluidcontrol/source/blender/blenkernel/BKE_node.h
branches/fluidcontrol/source/blender/blenkernel/intern/DerivedMesh.c
branches/fluidcontrol/source/blender/blenkernel/intern/image.c
branches/fluidcontrol/source/blender/blenkernel/intern/library.c
branches/fluidcontrol/source/blender/blenkernel/intern/mball.c
branches/fluidcontrol/source/blender/blenkernel/intern/node.c
branches/fluidcontrol/source/blender/blenkernel/intern/packedFile.c
branches/fluidcontrol/source/blender/blenkernel/intern/particle_system.c
branches/fluidcontrol/source/blender/blenkernel/intern/pointcache.c
branches/fluidcontrol/source/blender/blenkernel/intern/sound.c
branches/fluidcontrol/source/blender/blenkernel/intern/text.c
branches/fluidcontrol/source/blender/blenkernel/intern/writeavi.c
branches/fluidcontrol/source/blender/blenkernel/intern/writeffmpeg.c
branches/fluidcontrol/source/blender/blenlib/BLI_blenlib.h
branches/fluidcontrol/source/blender/blenlib/intern/bpath.c
branches/fluidcontrol/source/blender/blenlib/intern/util.c
branches/fluidcontrol/source/blender/blenloader/intern/genfile.c
branches/fluidcontrol/source/blender/include/BIF_screen.h
branches/fluidcontrol/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/fluidcontrol/source/blender/python/BPY_interface.c
branches/fluidcontrol/source/blender/python/BPY_menus.c
branches/fluidcontrol/source/blender/python/api2_2x/Blender.c
branches/fluidcontrol/source/blender/python/api2_2x/Library.c
branches/fluidcontrol/source/blender/python/api2_2x/Node.c
branches/fluidcontrol/source/blender/python/api2_2x/Sys.c
branches/fluidcontrol/source/blender/python/api2_2x/sceneRender.c
branches/fluidcontrol/source/blender/render/intern/source/pipeline.c
branches/fluidcontrol/source/blender/src/buttons_shading.c
branches/fluidcontrol/source/blender/src/drawimage.c
branches/fluidcontrol/source/blender/src/editimasel.c
branches/fluidcontrol/source/blender/src/editobject.c
branches/fluidcontrol/source/blender/src/editscreen.c
branches/fluidcontrol/source/blender/src/editsima.c
branches/fluidcontrol/source/blender/src/editsound.c
branches/fluidcontrol/source/blender/src/filesel.c
branches/fluidcontrol/source/blender/src/fluidsim.c
branches/fluidcontrol/source/blender/src/ghostwinlay.c
branches/fluidcontrol/source/blender/src/header_action.c
branches/fluidcontrol/source/blender/src/header_ipo.c
branches/fluidcontrol/source/blender/src/header_nla.c
branches/fluidcontrol/source/blender/src/interface_draw.c
branches/fluidcontrol/source/blender/src/outliner.c
branches/fluidcontrol/source/blender/src/screendump.c
branches/fluidcontrol/source/blender/src/seqaudio.c
branches/fluidcontrol/source/blender/src/sequence.c
branches/fluidcontrol/source/blender/src/writeimage.c
branches/fluidcontrol/source/blender/yafray/intern/export_File.cpp
branches/fluidcontrol/source/blender/yafray/intern/export_Plugin.cpp
branches/fluidcontrol/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.cpp
Modified: branches/fluidcontrol/config/darwin-config.py
===================================================================
--- branches/fluidcontrol/config/darwin-config.py 2008-05-04 14:14:09 UTC
(rev 14677)
+++ branches/fluidcontrol/config/darwin-config.py 2008-05-04 14:14:54 UTC
(rev 14678)
@@ -221,9 +221,10 @@
CCFLAGS=SDK_FLAGS+CCFLAGS
CXXFLAGS=SDK_FLAGS+CXXFLAGS
+# you can add -mssse3 if gcc >= 4.2
if MAC_PROC == 'i386':
- REL_CFLAGS =
['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mssse3']
- REL_CCFLAGS =
['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mssse3']
+ REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
+ REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
else:
CFLAGS = CFLAGS+['-fno-strict-aliasing']
CCFLAGS = CCFLAGS+['-fno-strict-aliasing']
Modified: branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.cpp
2008-05-04 14:14:09 UTC (rev 14677)
+++ branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.cpp
2008-05-04 14:14:54 UTC (rev 14678)
@@ -34,10 +34,9 @@
* @date May 7, 2001
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <Carbon/Carbon.h>
+#include <ApplicationServices/ApplicationServices.h>
#include "GHOST_SystemCarbon.h"
#include "GHOST_DisplayManagerCarbon.h"
@@ -52,6 +51,7 @@
#include "GHOST_WindowManager.h"
#include "GHOST_WindowCarbon.h"
#include "GHOST_NDOFManager.h"
+#include "AssertMacros.h"
#define GHOST_KEY_SWITCH(mac, ghost) { case (mac): ghostKey = (ghost); break; }
@@ -1121,13 +1121,16 @@
OSStatus err = noErr;
GHOST_TUns8 * temp_buff;
CFRange range;
+ OSStatus syncFlags;
err = PasteboardCreate(kPasteboardClipboard, &inPasteboard);
if(err != noErr) { return NULL;}
- err = PasteboardSynchronize( inPasteboard );
- if(err != noErr) { return NULL;}
+ syncFlags = PasteboardSynchronize( inPasteboard );
+ /* as we always get in a new string, we can safely ignore sync
flags if not an error*/
+ if(syncFlags <0) { return NULL;}
+
err = PasteboardGetItemIdentifier( inPasteboard, 1, &itemID );
if(err != noErr) { return NULL;}
@@ -1152,15 +1155,18 @@
void GHOST_SystemCarbon::putClipboard(GHOST_TInt8 *buffer, int flag) const
{
if(flag == 1) {return;} //If Flag is 1 means the selection and is used
on X11
+
PasteboardRef inPasteboard;
CFDataRef textData = NULL;
OSStatus err = noErr; /*For error checking*/
+ OSStatus syncFlags;
err = PasteboardCreate(kPasteboardClipboard, &inPasteboard);
if(err != noErr) { return;}
- err = PasteboardSynchronize( inPasteboard );
- if(err != noErr) { return;}
+ syncFlags = PasteboardSynchronize( inPasteboard );
+ /* as we always put in a new string, we can safely ignore sync flags */
+ if(syncFlags <0) { return;}
err = PasteboardClear( inPasteboard );
if(err != noErr) { return;}
Modified: branches/fluidcontrol/release/scripts/console.py
===================================================================
--- branches/fluidcontrol/release/scripts/console.py 2008-05-04 14:14:09 UTC
(rev 14677)
+++ branches/fluidcontrol/release/scripts/console.py 2008-05-04 14:14:54 UTC
(rev 14678)
@@ -61,7 +61,7 @@
global __FONT_SIZE__
-__FONT_SIZES__ = ( ('tiny', 10), ('small', 12), ('normal', 14), ('large', 16) )
+__FONT_SIZES__ = ( ('tiny', 10), ('small', 12), ('normalfix', 14), ('large',
16) )
__FONT_SIZE__ = 2 # index for the list above, normal default.
global __CONSOLE_LINE_OFFSET__
@@ -420,9 +420,13 @@
global histIndex, cmdBuffer
if abs(histIndex)+1 >= len(cmdBuffer):
histIndex = -1
+ histIndex_orig = histIndex
histIndex -= 1
- while cmdBuffer[histIndex].type != 0 and abs(histIndex) <
len(cmdBuffer):
+
+ while (cmdBuffer[histIndex].type != 0 and abs(histIndex) <
len(cmdBuffer)) or \
+ ( cmdBuffer[histIndex].cmd ==
cmdBuffer[histIndex_orig].cmd):
histIndex -= 1
+
if cmdBuffer[histIndex].type == 0: # we found one
cmdBuffer[-1].cmd = cmdBuffer[histIndex].cmd
@@ -430,9 +434,13 @@
global histIndex, cmdBuffer
if histIndex >= -2:
histIndex = -len(cmdBuffer)
+ histIndex_orig = histIndex
histIndex += 1
- while cmdBuffer[histIndex].type != 0 and histIndex != -2:
+ while (cmdBuffer[histIndex].type != 0 and histIndex != -2) or
\
+ ( cmdBuffer[histIndex].cmd ==
cmdBuffer[histIndex_orig].cmd):
+
histIndex += 1
+
if cmdBuffer[histIndex].type == 0: # we found one
cmdBuffer[-1].cmd = cmdBuffer[histIndex].cmd
Modified: branches/fluidcontrol/release/scripts/wizard_curve2tree.py
===================================================================
--- branches/fluidcontrol/release/scripts/wizard_curve2tree.py 2008-05-04
14:14:09 UTC (rev 14677)
+++ branches/fluidcontrol/release/scripts/wizard_curve2tree.py 2008-05-04
14:14:54 UTC (rev 14678)
@@ -3405,7 +3405,7 @@
if leaf_object:
ob_leaf_dupliface.enableDupFaces = True
ob_leaf_dupliface.enableDupFacesScale = True
- ob_leaf_dupliface.makeParent([leaf_object])
+ ob_leaf_dupliface.makeParent([leaf_object], 1)
else:
ob_leaf_dupliface.enableDupFaces = False
@@ -3637,7 +3637,7 @@
GLOBALS['non_bez_error'] = 0
def do_tree_help(e,v):
- url =
'http://wiki.blender.org/index.php/Scripts/Manual/Export/autodesk_fbx'
+ url =
'http://wiki.blender.org/index.php/Scripts/Manual/Wizards/TreeFromCurves'
print 'Trying to open web browser with documentation at this address...'
print '\t' + url
Modified: branches/fluidcontrol/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/BKE_node.h 2008-05-04
14:14:09 UTC (rev 14677)
+++ branches/fluidcontrol/source/blender/blenkernel/BKE_node.h 2008-05-04
14:14:54 UTC (rev 14678)
@@ -33,8 +33,9 @@
#ifndef BKE_NODE_H
#define BKE_NODE_H
+/* not very important, but the stack solver likes to know a maximum */
+#define MAX_SOCKET 64
-
struct ID;
struct bNodeTree;
struct bNode;
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/DerivedMesh.c
2008-05-04 14:14:09 UTC (rev 14677)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/DerivedMesh.c
2008-05-04 14:14:54 UTC (rev 14678)
@@ -3304,7 +3304,9 @@
} else { // 3
strcat(targetDir,"fluidsurface_final_####");
}
- BLI_convertstringcode(targetDir, G.sce, curFrame); // fixed #frame-no
+ BLI_convertstringcode(targetDir, G.sce);
+ BLI_convertstringframe(targetDir, curFrame); // fixed #frame-no
+
strcpy(targetFile,targetDir);
strcat(targetFile, ".bobj.gz");
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/image.c
2008-05-04 14:14:09 UTC (rev 14677)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/image.c
2008-05-04 14:14:54 UTC (rev 14678)
@@ -351,7 +351,8 @@
}
BLI_strncpy(str, name, sizeof(str));
- BLI_convertstringcode(str, G.sce, G.scene->r.cfra);
+ BLI_convertstringcode(str, G.sce);
+ BLI_convertstringframe(str, G.scene->r.cfra); /* TODO - should this
realy be here? */
/* exists? */
file= open(str, O_BINARY|O_RDONLY);
@@ -362,7 +363,8 @@
for(ima= G.main->image.first; ima; ima= ima->id.next) {
if(ima->source!=IMA_SRC_VIEWER &&
ima->source!=IMA_SRC_GENERATED) {
BLI_strncpy(strtest, ima->name, sizeof(ima->name));
- BLI_convertstringcode(strtest, G.sce, G.scene->r.cfra);
+ BLI_convertstringcode(strtest, G.sce);
+ BLI_convertstringframe(strtest, G.scene->r.cfra); /*
TODO - should this be here? */
if( strcmp(strtest, str)==0 ) {
if(ima->anim==NULL || ima->id.us==0) {
@@ -1243,7 +1245,8 @@
if (strchr(string, '#')==NULL)
strcat(string, "####"); /* 4 numbers */
- BLI_convertstringcode(string, G.sce, frame);
+ BLI_convertstringcode(string, G.sce);
+ BLI_convertstringframe(string, frame);
if(G.scene->r.scemode & R_EXTENSION)
BKE_add_image_extension(string, imtype);
@@ -1479,10 +1482,12 @@
BLI_strncpy(name, ima->name, sizeof(name));
if(ima->id.lib)
- BLI_convertstringcode(name, ima->id.lib->filename, frame);
+ BLI_convertstringcode(name, ima->id.lib->filename);
else
- BLI_convertstringcode(name, G.sce, frame);
+ BLI_convertstringcode(name, G.sce);
+ BLI_convertstringframe(name, frame); /* TODO - should this be here? */
+
/* read ibuf */
ibuf = IMB_loadiffname(name, IB_rect|IB_multilayer);
if(G.f & G_DEBUG) printf("loaded %s\n", name);
@@ -1582,9 +1587,9 @@
BLI_strncpy(str, ima->name, FILE_MAX);
if(ima->id.lib)
- BLI_convertstringcode(str, ima->id.lib->filename, 0);
+ BLI_convertstringcode(str, ima->id.lib->filename);
else
- BLI_convertstringcode(str, G.sce, 0);
+ BLI_convertstringcode(str, G.sce);
ima->anim = openanim(str, IB_cmap | IB_rect);
@@ -1636,10 +1641,12 @@
/* get the right string */
BLI_strncpy(str, ima->name, sizeof(str));
if(ima->id.lib)
- BLI_convertstringcode(str, ima->id.lib->filename, cfra);
+ BLI_convertstringcode(str, ima->id.lib->filename);
else
- BLI_convertstringcode(str, G.sce, cfra);
+ BLI_convertstringcode(str, G.sce);
+ BLI_convertstringframe(str, cfra);
+
/* read ibuf */
ibuf = IMB_loadiffname(str, IB_rect|IB_multilayer|IB_imginfo);
}
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/library.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/library.c
2008-05-04 14:14:09 UTC (rev 14677)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/library.c
2008-05-04 14:14:54 UTC (rev 14678)
@@ -974,7 +974,7 @@
{
if(ima->id.lib==NULL) return;
if(strncmp(ima->name, "//", 2)==0) {
- BLI_convertstringcode(ima->name, ima->id.lib->filename, 0);
+ BLI_convertstringcode(ima->name, ima->id.lib->filename);
BLI_makestringcode(G.sce, ima->name);
}
}
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/mball.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/mball.c
2008-05-04 14:14:09 UTC (rev 14677)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
