[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31369] trunk/blender/source: - commit that removed MEM_guardedalloc. h includes broke building with SSE enabled.
Campbell Barton
ideasman42 at gmail.com
Mon Aug 16 11:24:19 CEST 2010
Revision: 31369
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31369
Author: campbellbarton
Date: 2010-08-16 11:24:18 +0200 (Mon, 16 Aug 2010)
Log Message:
-----------
- commit that removed MEM_guardedalloc.h includes broke building with SSE enabled.
- all C/C++ files in blender are now utf8 compatible.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/fluidsim.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_vfont.c
trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
trunk/blender/source/gameengine/GamePlayer/ActiveX/CControlRefresher.cpp
trunk/blender/source/gameengine/GamePlayer/netscape/common/npmac.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/fluidsim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fluidsim.c 2010-08-16 06:38:30 UTC (rev 31368)
+++ trunk/blender/source/blender/blenkernel/intern/fluidsim.c 2010-08-16 09:24:18 UTC (rev 31369)
@@ -50,7 +50,6 @@
#include "BKE_global.h"
#include "BKE_modifier.h"
#include "BKE_mesh.h"
-#include "BKE_pointcache.h"
#include "BKE_utildefines.h"
// headers for fluidsim bobj meshes
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2010-08-16 06:38:30 UTC (rev 31368)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2010-08-16 09:24:18 UTC (rev 31369)
@@ -97,7 +97,6 @@
#include "BKE_library.h"
#include "BKE_modifier.h"
#include "BKE_particle.h"
-#include "BKE_pointcache.h"
static void rna_UVProject_projectors_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
Modified: trunk/blender/source/blender/makesrna/intern/rna_vfont.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_vfont.c 2010-08-16 06:38:30 UTC (rev 31368)
+++ trunk/blender/source/blender/makesrna/intern/rna_vfont.c 2010-08-16 09:24:18 UTC (rev 31369)
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * Contributor(s): Blender Foundation (2008), Juho Veps\xE4l\xE4inen
+ * Contributor(s): Blender Foundation (2008), Juho Vepsäläinen
*
* ***** END GPL LICENSE BLOCK *****
*/
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp 2010-08-16 06:38:30 UTC (rev 31368)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp 2010-08-16 09:24:18 UTC (rev 31369)
@@ -26,6 +26,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
+#include "MEM_guardedalloc.h"
#include "vbvh.h"
#include "svbvh.h"
#include "reorganize.h"
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp 2010-08-16 06:38:30 UTC (rev 31368)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp 2010-08-16 09:24:18 UTC (rev 31369)
@@ -26,6 +26,8 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
+#include "MEM_guardedalloc.h"
+
#include "vbvh.h"
#include "svbvh.h"
#include "reorganize.h"
Modified: trunk/blender/source/gameengine/GamePlayer/ActiveX/CControlRefresher.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ActiveX/CControlRefresher.cpp 2010-08-16 06:38:30 UTC (rev 31368)
+++ trunk/blender/source/gameengine/GamePlayer/ActiveX/CControlRefresher.cpp 2010-08-16 09:24:18 UTC (rev 31369)
@@ -69,7 +69,7 @@
// Let the thread know to nicely commit suicide.
m_ack = false;
m_exit = true;
- // Boost the thread\x92s priority so it can finish whatever it has to do before it dies.
+ // Boost the thread's priority so it can finish whatever it has to do before it dies.
//::SetThreadPriority(m_hThread, THREAD_PRIORITY_TIME_CRITICAL);
// Wait until the thread has in fact died.
while (!m_ack) Sleep(10);
Modified: trunk/blender/source/gameengine/GamePlayer/netscape/common/npmac.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/netscape/common/npmac.cpp 2010-08-16 06:38:30 UTC (rev 31368)
+++ trunk/blender/source/gameengine/GamePlayer/netscape/common/npmac.cpp 2010-08-16 09:24:18 UTC (rev 31369)
@@ -44,7 +44,7 @@
//
// A4Stuff.h contains the definition of EnterCodeResource and
-// EnterCodeResource, used for setting up the code resource\xD5s
+// EnterCodeResource, used for setting up the code resource's
// globals for 68K (analagous to the function SetCurrentA5
// defined by the toolbox).
//
@@ -101,8 +101,8 @@
//
//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-QDGlobals* gQDPtr; // Pointer to Netscape\xD5s QuickDraw globals
-short gResFile; // Refnum of the plugin\xD5s resource file
+QDGlobals* gQDPtr; // Pointer to Netscape's QuickDraw globals
+short gResFile; // Refnum of the plugin's resource file
NPNetscapeFuncs gNetscapeFuncs; // Function table for procs in Netscape called by plugin
@@ -441,7 +441,7 @@
Str255 errName;
//
- // Memorize the plugin\xD5s resource file
+ // Memorize the plugin's resource file
// refnum for later use.
//
gResFile = CurResFile();
@@ -482,7 +482,7 @@
//
// Now that we know the app name and FSSpec, we can call GetDiskFragment
// to get a connID to use in a subsequent call to FindSymbol (it will also
- // return the address of \xD2main\xD3 in app, which we ignore). If GetDiskFragment
+ // return the address of 'main' in app, which we ignore). If GetDiskFragment
// returns an error, we assume the app must be 68K.
//
Ptr mainAddr;
@@ -494,7 +494,7 @@
{
//
// The app is a PPC code fragment, so call FindSymbol
- // to get the exported \xD2qd\xD3 symbol so we can access its
+ // to get the exported 'qd' symbol so we can access its
// QuickDraw globals.
//
SymClass symClass;
@@ -536,11 +536,11 @@
err = NPERR_INVALID_FUNCTABLE_ERROR;
//
- // Check the \xD2major\xD3 version passed in Netscape\xD5s function table.
- // We won\xD5t load if the major version is newer than what we expect.
+ // Check the 'major' version passed in Netscape's function table.
+ // We won't load if the major version is newer than what we expect.
// Also check that the function tables passed in are big enough for
// all the functions we need (they could be bigger, if Netscape added
- // new APIs, but that\xD5s OK with us -- we\xD5ll just ignore them).
+ // new APIs, but that's OK with us -- we'll just ignore them).
//
if (err == NPERR_NO_ERROR)
{
@@ -556,7 +556,7 @@
if (err == NPERR_NO_ERROR)
{
//
- // Copy all the fields of Netscape\xD5s function table into our
+ // Copy all the fields of Netscape's function table into our
// copy so we can call back into Netscape later. Note that
// we need to copy the fields one by one, rather than assigning
// the whole structure, because the Netscape function table
More information about the Bf-blender-cvs
mailing list