[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11946] branches/2-44-stable/blender: branches/2-44-stable
Diego Borghetti (Plumiferos)
bdiego at gmail.com
Thu Sep 6 03:00:30 CEST 2007
Revision: 11946
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11946
Author: bdiego
Date: 2007-09-06 03:00:30 +0200 (Thu, 06 Sep 2007)
Log Message:
-----------
branches/2-44-stable
Merge from trunk:
revision 11890
revision 11896
revision 11903
revision 11904
revision 11917
revision 11919
revision 11922
revision 11923
revision 11939
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11890
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11896
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11903
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11904
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11917
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11919
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11922
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11923
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11939
Modified Paths:
--------------
branches/2-44-stable/blender/config/darwin-config.py
branches/2-44-stable/blender/intern/elbeem/intern/isosurface.cpp
branches/2-44-stable/blender/intern/elbeem/intern/simulation_object.cpp
branches/2-44-stable/blender/intern/elbeem/intern/solver_class.h
branches/2-44-stable/blender/intern/elbeem/intern/solver_interface.cpp
branches/2-44-stable/blender/intern/elbeem/intern/solver_main.cpp
branches/2-44-stable/blender/intern/elbeem/intern/utilities.h
branches/2-44-stable/blender/intern/ghost/intern/GHOST_WindowX11.cpp
branches/2-44-stable/blender/intern/iksolver/intern/IK_QJacobianSolver.cpp
branches/2-44-stable/blender/intern/memutil/MEM_CacheLimiter.h
branches/2-44-stable/blender/intern/string/intern/STR_String.cpp
branches/2-44-stable/blender/source/blender/blenkernel/bad_level_call_stubs/Makefile
branches/2-44-stable/blender/source/blender/blenkernel/intern/Makefile
branches/2-44-stable/blender/source/blender/blenlib/intern/Makefile
branches/2-44-stable/blender/source/blender/blenloader/intern/Makefile
branches/2-44-stable/blender/source/blender/blenpluginapi/intern/Makefile
branches/2-44-stable/blender/source/blender/ftfont/intern/Makefile
branches/2-44-stable/blender/source/blender/imbuf/intern/Makefile
branches/2-44-stable/blender/source/blender/imbuf/intern/cineon/Makefile
branches/2-44-stable/blender/source/blender/imbuf/intern/divers.c
branches/2-44-stable/blender/source/blender/imbuf/intern/openexr/Makefile
branches/2-44-stable/blender/source/blender/include/butspace.h
branches/2-44-stable/blender/source/blender/makesdna/intern/Makefile
branches/2-44-stable/blender/source/blender/nodes/intern/CMP_nodes/Makefile
branches/2-44-stable/blender/source/blender/nodes/intern/Makefile
branches/2-44-stable/blender/source/blender/nodes/intern/SHD_nodes/Makefile
branches/2-44-stable/blender/source/blender/python/api2_2x/Makefile
branches/2-44-stable/blender/source/blender/radiosity/intern/source/Makefile
branches/2-44-stable/blender/source/blender/readblenfile/intern/Makefile
branches/2-44-stable/blender/source/blender/readblenfile/stub/Makefile
branches/2-44-stable/blender/source/blender/readblenfile/test/Makefile
branches/2-44-stable/blender/source/blender/render/intern/source/Makefile
branches/2-44-stable/blender/source/blender/render/intern/source/shadeoutput.c
branches/2-44-stable/blender/source/blender/src/Makefile
branches/2-44-stable/blender/source/blender/src/buttons_object.c
branches/2-44-stable/blender/source/blender/src/drawnode.c
branches/2-44-stable/blender/source/blender/src/outliner.c
branches/2-44-stable/blender/source/blender/verify/intern/Makefile
branches/2-44-stable/blender/source/blender/yafray/intern/Makefile
branches/2-44-stable/blender/source/creator/Makefile
branches/2-44-stable/blender/source/kernel/gen_messaging/intern/Makefile
branches/2-44-stable/blender/source/nan_compile.mk
Modified: branches/2-44-stable/blender/config/darwin-config.py
===================================================================
--- branches/2-44-stable/blender/config/darwin-config.py 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/config/darwin-config.py 2007-09-06 01:00:30 UTC (rev 11946)
@@ -52,6 +52,7 @@
BF_OPENEXR = '${LCGDIR}/openexr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
WITH_BF_JPEG = 'true'
Modified: branches/2-44-stable/blender/intern/elbeem/intern/isosurface.cpp
===================================================================
--- branches/2-44-stable/blender/intern/elbeem/intern/isosurface.cpp 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/intern/elbeem/intern/isosurface.cpp 2007-09-06 01:00:30 UTC (rev 11946)
@@ -13,11 +13,6 @@
#include <algorithm>
#include <stdio.h>
-// sirdude fix for solaris
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
-#include <ieeefp.h>
-#endif
-
// just use default rounding for platforms where its not available
#ifndef round
#define round(x) (x)
Modified: branches/2-44-stable/blender/intern/elbeem/intern/simulation_object.cpp
===================================================================
--- branches/2-44-stable/blender/intern/elbeem/intern/simulation_object.cpp 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/intern/elbeem/intern/simulation_object.cpp 2007-09-06 01:00:30 UTC (rev 11946)
@@ -15,6 +15,7 @@
#include "solver_interface.h"
#include "particletracer.h"
#include "elbeem.h"
+#include <stdlib.h> /* exit(3) - also in linux */
#ifdef _WIN32
#else
Modified: branches/2-44-stable/blender/intern/elbeem/intern/solver_class.h
===================================================================
--- branches/2-44-stable/blender/intern/elbeem/intern/solver_class.h 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/intern/elbeem/intern/solver_class.h 2007-09-06 01:00:30 UTC (rev 11946)
@@ -99,10 +99,9 @@
#define LBM_INLINED inline
// sirdude fix for solaris
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
-#include <ieeefp.h>
+#if !defined(linux) && defined(sun)
#ifndef expf
-#define expf exp
+#define expf(a) exp((double)(a))
#endif
#endif
Modified: branches/2-44-stable/blender/intern/elbeem/intern/solver_interface.cpp
===================================================================
--- branches/2-44-stable/blender/intern/elbeem/intern/solver_interface.cpp 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/intern/elbeem/intern/solver_interface.cpp 2007-09-06 01:00:30 UTC (rev 11946)
@@ -17,6 +17,7 @@
#include "ntl_world.h"
#include "elbeem.h"
+#include <stdlib.h> /* getenv(3) - also in linux */
Modified: branches/2-44-stable/blender/intern/elbeem/intern/solver_main.cpp
===================================================================
--- branches/2-44-stable/blender/intern/elbeem/intern/solver_main.cpp 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/intern/elbeem/intern/solver_main.cpp 2007-09-06 01:00:30 UTC (rev 11946)
@@ -7,6 +7,7 @@
*
*****************************************************************************/
+#include <stdlib.h> /* rand(3) - also in linux */
#include "solver_class.h"
#include "solver_relax.h"
#include "particletracer.h"
Modified: branches/2-44-stable/blender/intern/elbeem/intern/utilities.h
===================================================================
--- branches/2-44-stable/blender/intern/elbeem/intern/utilities.h 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/intern/elbeem/intern/utilities.h 2007-09-06 01:00:30 UTC (rev 11946)
@@ -9,7 +9,12 @@
#ifndef UTILITIES_H
#include "ntl_vector3dim.h"
+// Solaris requires ieeefp.h for finite(3C)
+#if !defined(linux) && defined(sun)
+#include <ieeefp.h>
+#endif
+
/* debugging outputs , debug level 0 (off) to 10 (max) */
#ifdef ELBEEM_PLUGIN
#define DEBUG 0
Modified: branches/2-44-stable/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/2-44-stable/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2007-09-06 01:00:30 UTC (rev 11946)
@@ -38,6 +38,11 @@
#include <X11/cursorfont.h>
#include <X11/Xatom.h>
+#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__)
+#include <strings.h>
+#endif
+
+
// For obscure full screen mode stuuf
// lifted verbatim from blut.
Modified: branches/2-44-stable/blender/intern/iksolver/intern/IK_QJacobianSolver.cpp
===================================================================
--- branches/2-44-stable/blender/intern/iksolver/intern/IK_QJacobianSolver.cpp 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/intern/iksolver/intern/IK_QJacobianSolver.cpp 2007-09-06 01:00:30 UTC (rev 11946)
@@ -30,10 +30,9 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
+#include <stdio.h>
#include "IK_QJacobianSolver.h"
-//#include "analyze.h"
-
void IK_QJacobianSolver::AddSegmentList(IK_QSegment *seg)
{
m_segments.push_back(seg);
Modified: branches/2-44-stable/blender/intern/memutil/MEM_CacheLimiter.h
===================================================================
--- branches/2-44-stable/blender/intern/memutil/MEM_CacheLimiter.h 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/intern/memutil/MEM_CacheLimiter.h 2007-09-06 01:00:30 UTC (rev 11946)
@@ -68,6 +68,7 @@
extern int MEM_CacheLimiter_get_maximum();
// this is rather _ugly_!
extern int mem_in_use;
+ extern int mmap_in_use;
};
#endif
@@ -148,7 +149,7 @@
return;
}
for (iterator it = queue.begin();
- it != queue.end() && mem_in_use > max;) {
+ it != queue.end() && mem_in_use + mmap_in_use > max;) {
iterator jt = it;
++it;
(*jt)->destroy_if_possible();
Modified: branches/2-44-stable/blender/intern/string/intern/STR_String.cpp
===================================================================
--- branches/2-44-stable/blender/intern/string/intern/STR_String.cpp 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/intern/string/intern/STR_String.cpp 2007-09-06 01:00:30 UTC (rev 11946)
@@ -41,6 +41,7 @@
#include <stdarg.h>
#include <stdlib.h>
#include <ctype.h>
+#include <string.h>
#include "STR_String.h"
/*-------------------------------------------------------------------------------------------------
Modified: branches/2-44-stable/blender/source/blender/blenkernel/bad_level_call_stubs/Makefile
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/bad_level_call_stubs/Makefile 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/source/blender/blenkernel/bad_level_call_stubs/Makefile 2007-09-06 01:00:30 UTC (rev 11946)
@@ -39,10 +39,6 @@
CFLAGS += $(LEVEL_2_C_WARNINGS)
CFLAGS += $(FIX_STUBS_WARNINGS)
-ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows"))
- CFLAGS += -funsigned-char
-endif
-
CPPFLAGS += $(OGL_CPPFLAGS)
CPPFLAGS += -I../../makesdna
CPPFLAGS += -I../../include
Modified: branches/2-44-stable/blender/source/blender/blenkernel/intern/Makefile
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/intern/Makefile 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/source/blender/blenkernel/intern/Makefile 2007-09-06 01:00:30 UTC (rev 11946)
@@ -36,10 +36,6 @@
include nan_compile.mk
-ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd openbsd linux solaris windows"))
- CFLAGS += -funsigned-char
-endif
-
CFLAGS += $(LEVEL_1_C_WARNINGS)
# OpenGL and Python
Modified: branches/2-44-stable/blender/source/blender/blenlib/intern/Makefile
===================================================================
--- branches/2-44-stable/blender/source/blender/blenlib/intern/Makefile 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/source/blender/blenlib/intern/Makefile 2007-09-06 01:00:30 UTC (rev 11946)
@@ -36,10 +36,6 @@
include nan_compile.mk
-ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows"))
- CFLAGS += -funsigned-char
-endif
-
# CPPFLAGS += $(LEVEL_2_CPP_WARNINGS)
# path to SDNA types
Modified: branches/2-44-stable/blender/source/blender/blenloader/intern/Makefile
===================================================================
--- branches/2-44-stable/blender/source/blender/blenloader/intern/Makefile 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/source/blender/blenloader/intern/Makefile 2007-09-06 01:00:30 UTC (rev 11946)
@@ -38,10 +38,6 @@
# CFLAGS += $(LEVEL_2_C_WARNINGS)
-ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows"))
- CFLAGS += -funsigned-char
-endif
-
# OpenGL and Python
CPPFLAGS += $(OGL_CPPFLAGS)
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
Modified: branches/2-44-stable/blender/source/blender/blenpluginapi/intern/Makefile
===================================================================
--- branches/2-44-stable/blender/source/blender/blenpluginapi/intern/Makefile 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/source/blender/blenpluginapi/intern/Makefile 2007-09-06 01:00:30 UTC (rev 11946)
@@ -36,10 +36,6 @@
include nan_compile.mk
-ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows"))
- CFLAGS += -funsigned-char
-endif
-
ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris"))
CFLAGS += -shared
endif
Modified: branches/2-44-stable/blender/source/blender/ftfont/intern/Makefile
===================================================================
--- branches/2-44-stable/blender/source/blender/ftfont/intern/Makefile 2007-09-05 17:55:44 UTC (rev 11945)
+++ branches/2-44-stable/blender/source/blender/ftfont/intern/Makefile 2007-09-06 01:00:30 UTC (rev 11946)
@@ -36,10 +36,6 @@
include nan_compile.mk
-ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows"))
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list