[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11916] branches/imgbrowser-elubie: == imagebrowser ==

Andrea Weikert elubie at gmx.net
Sun Sep 2 13:11:07 CEST 2007


Revision: 11916
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11916
Author:   elubie
Date:     2007-09-02 13:11:05 +0200 (Sun, 02 Sep 2007)

Log Message:
-----------
== imagebrowser ==
merge from trunk, rev. 11899 to rev. 11915

Modified Paths:
--------------
    branches/imgbrowser-elubie/SConstruct
    branches/imgbrowser-elubie/intern/elbeem/intern/isosurface.cpp
    branches/imgbrowser-elubie/intern/elbeem/intern/simulation_object.cpp
    branches/imgbrowser-elubie/intern/elbeem/intern/solver_class.h
    branches/imgbrowser-elubie/intern/elbeem/intern/solver_interface.cpp
    branches/imgbrowser-elubie/intern/elbeem/intern/solver_main.cpp
    branches/imgbrowser-elubie/intern/elbeem/intern/utilities.h
    branches/imgbrowser-elubie/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/imgbrowser-elubie/intern/iksolver/intern/IK_QJacobianSolver.cpp
    branches/imgbrowser-elubie/intern/string/intern/STR_String.cpp
    branches/imgbrowser-elubie/po/Makefile
    branches/imgbrowser-elubie/projectfiles_vc7/blender/nodes/nodes.vcproj
    branches/imgbrowser-elubie/source/blender/blenkernel/BKE_node.h
    branches/imgbrowser-elubie/source/blender/blenkernel/bad_level_call_stubs/Makefile
    branches/imgbrowser-elubie/source/blender/blenkernel/intern/Makefile
    branches/imgbrowser-elubie/source/blender/blenkernel/intern/node.c
    branches/imgbrowser-elubie/source/blender/blenlib/intern/Makefile
    branches/imgbrowser-elubie/source/blender/blenloader/intern/Makefile
    branches/imgbrowser-elubie/source/blender/blenpluginapi/intern/Makefile
    branches/imgbrowser-elubie/source/blender/ftfont/intern/Makefile
    branches/imgbrowser-elubie/source/blender/imbuf/intern/Makefile
    branches/imgbrowser-elubie/source/blender/imbuf/intern/cineon/Makefile
    branches/imgbrowser-elubie/source/blender/imbuf/intern/dds/Makefile
    branches/imgbrowser-elubie/source/blender/imbuf/intern/openexr/Makefile
    branches/imgbrowser-elubie/source/blender/makesdna/intern/Makefile
    branches/imgbrowser-elubie/source/blender/nodes/SHD_node.h
    branches/imgbrowser-elubie/source/blender/nodes/intern/CMP_nodes/Makefile
    branches/imgbrowser-elubie/source/blender/nodes/intern/Makefile
    branches/imgbrowser-elubie/source/blender/nodes/intern/SHD_nodes/Makefile
    branches/imgbrowser-elubie/source/blender/python/api2_2x/Makefile
    branches/imgbrowser-elubie/source/blender/python/api2_2x/NLA.c
    branches/imgbrowser-elubie/source/blender/python/api2_2x/Object.c
    branches/imgbrowser-elubie/source/blender/radiosity/intern/source/Makefile
    branches/imgbrowser-elubie/source/blender/readblenfile/intern/Makefile
    branches/imgbrowser-elubie/source/blender/readblenfile/stub/Makefile
    branches/imgbrowser-elubie/source/blender/readblenfile/test/Makefile
    branches/imgbrowser-elubie/source/blender/render/intern/source/Makefile
    branches/imgbrowser-elubie/source/blender/src/Makefile
    branches/imgbrowser-elubie/source/blender/src/edit.c
    branches/imgbrowser-elubie/source/blender/src/editarmature.c
    branches/imgbrowser-elubie/source/blender/src/editobject.c
    branches/imgbrowser-elubie/source/blender/verify/intern/Makefile
    branches/imgbrowser-elubie/source/blender/yafray/intern/Makefile
    branches/imgbrowser-elubie/source/creator/Makefile
    branches/imgbrowser-elubie/source/kernel/gen_messaging/intern/Makefile
    branches/imgbrowser-elubie/source/nan_compile.mk

Added Paths:
-----------
    branches/imgbrowser-elubie/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c

Modified: branches/imgbrowser-elubie/SConstruct
===================================================================
--- branches/imgbrowser-elubie/SConstruct	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/SConstruct	2007-09-02 11:11:05 UTC (rev 11916)
@@ -241,13 +241,16 @@
     do_clean = True
 
 if not quickie and do_clean:
-    print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
-    dirs = os.listdir(B.root_build_dir)
-    for dir in dirs:
-        if os.path.isdir(B.root_build_dir + dir) == 1:
-            print "clean dir %s"%(B.root_build_dir+dir)
-            shutil.rmtree(B.root_build_dir+dir)
-    print B.bc.OKGREEN+'...done'+B.bc.ENDC
+    if os.path.exists(B.root_build_dir):
+        print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
+        dirs = os.listdir(B.root_build_dir)
+        for dir in dirs:
+            if os.path.isdir(B.root_build_dir + dir) == 1:
+                print "clean dir %s"%(B.root_build_dir+dir)
+                shutil.rmtree(B.root_build_dir+dir)
+        print B.bc.OKGREEN+'...done'+B.bc.ENDC
+    else:
+        print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC
     Exit()
 
 if not os.path.isdir ( B.root_build_dir):

Modified: branches/imgbrowser-elubie/intern/elbeem/intern/isosurface.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/elbeem/intern/isosurface.cpp	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/intern/elbeem/intern/isosurface.cpp	2007-09-02 11:11:05 UTC (rev 11916)
@@ -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/imgbrowser-elubie/intern/elbeem/intern/simulation_object.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/elbeem/intern/simulation_object.cpp	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/intern/elbeem/intern/simulation_object.cpp	2007-09-02 11:11:05 UTC (rev 11916)
@@ -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/imgbrowser-elubie/intern/elbeem/intern/solver_class.h
===================================================================
--- branches/imgbrowser-elubie/intern/elbeem/intern/solver_class.h	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/intern/elbeem/intern/solver_class.h	2007-09-02 11:11:05 UTC (rev 11916)
@@ -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/imgbrowser-elubie/intern/elbeem/intern/solver_interface.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/elbeem/intern/solver_interface.cpp	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/intern/elbeem/intern/solver_interface.cpp	2007-09-02 11:11:05 UTC (rev 11916)
@@ -17,6 +17,7 @@
 #include "ntl_world.h"
 #include "elbeem.h"
 
+#include <stdlib.h> /* getenv(3) - also in linux */
 
 
 

Modified: branches/imgbrowser-elubie/intern/elbeem/intern/solver_main.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/elbeem/intern/solver_main.cpp	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/intern/elbeem/intern/solver_main.cpp	2007-09-02 11:11:05 UTC (rev 11916)
@@ -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/imgbrowser-elubie/intern/elbeem/intern/utilities.h
===================================================================
--- branches/imgbrowser-elubie/intern/elbeem/intern/utilities.h	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/intern/elbeem/intern/utilities.h	2007-09-02 11:11:05 UTC (rev 11916)
@@ -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/imgbrowser-elubie/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/ghost/intern/GHOST_WindowX11.cpp	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/intern/ghost/intern/GHOST_WindowX11.cpp	2007-09-02 11:11:05 UTC (rev 11916)
@@ -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/imgbrowser-elubie/intern/iksolver/intern/IK_QJacobianSolver.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/iksolver/intern/IK_QJacobianSolver.cpp	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/intern/iksolver/intern/IK_QJacobianSolver.cpp	2007-09-02 11:11:05 UTC (rev 11916)
@@ -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/imgbrowser-elubie/intern/string/intern/STR_String.cpp
===================================================================
--- branches/imgbrowser-elubie/intern/string/intern/STR_String.cpp	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/intern/string/intern/STR_String.cpp	2007-09-02 11:11:05 UTC (rev 11916)
@@ -41,6 +41,7 @@
 #include <stdarg.h>
 #include <stdlib.h> 
 #include <ctype.h>
+#include <string.h>
 #include "STR_String.h"
 
 /*-------------------------------------------------------------------------------------------------

Modified: branches/imgbrowser-elubie/po/Makefile
===================================================================
--- branches/imgbrowser-elubie/po/Makefile	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/po/Makefile	2007-09-02 11:11:05 UTC (rev 11916)
@@ -36,7 +36,12 @@
 
 include nan_definitions.mk
 
-LINGUAS = ar bg ca cs de es fr hr it ja nl pl pt_BR ro ru sr sr at Latn sv uk zh_CN 
+ifeq ($(INTERNTIONAL),true)
+	LINGUAS = ar bg ca cs de es fr hr it ja nl pl pt_BR ro ru sr sr at Latn sv uk zh_CN
+else
+	LINGUAS = 
+endif
+
 ifeq ($(OS), darwin)
 DIR = $(OCGDIR)/bin/blender.app/Contents/Resources/locale/$@/LC_MESSAGES/
 else

Modified: branches/imgbrowser-elubie/projectfiles_vc7/blender/nodes/nodes.vcproj
===================================================================
--- branches/imgbrowser-elubie/projectfiles_vc7/blender/nodes/nodes.vcproj	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/projectfiles_vc7/blender/nodes/nodes.vcproj	2007-09-02 11:11:05 UTC (rev 11916)
@@ -361,6 +361,9 @@
 					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_geom.c">
 				</File>
 				<File
+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_hueSatVal.c">
+				</File>
+				<File
 					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_invert.c">
 				</File>
 				<File

Modified: branches/imgbrowser-elubie/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/imgbrowser-elubie/source/blender/blenkernel/BKE_node.h	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/source/blender/blenkernel/BKE_node.h	2007-09-02 11:11:05 UTC (rev 11916)
@@ -208,6 +208,7 @@
 #define SH_NODE_INVERT		119
 #define SH_NODE_SEPRGB		120
 #define SH_NODE_COMBRGB		121
+#define SH_NODE_HUE_SAT		122
 
 
 /* custom defines options for Material node */

Modified: branches/imgbrowser-elubie/source/blender/blenkernel/bad_level_call_stubs/Makefile
===================================================================
--- branches/imgbrowser-elubie/source/blender/blenkernel/bad_level_call_stubs/Makefile	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/source/blender/blenkernel/bad_level_call_stubs/Makefile	2007-09-02 11:11:05 UTC (rev 11916)
@@ -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/imgbrowser-elubie/source/blender/blenkernel/intern/Makefile
===================================================================
--- branches/imgbrowser-elubie/source/blender/blenkernel/intern/Makefile	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/source/blender/blenkernel/intern/Makefile	2007-09-02 11:11:05 UTC (rev 11916)
@@ -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/imgbrowser-elubie/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/imgbrowser-elubie/source/blender/blenkernel/intern/node.c	2007-09-02 09:50:09 UTC (rev 11915)
+++ branches/imgbrowser-elubie/source/blender/blenkernel/intern/node.c	2007-09-02 11:11:05 UTC (rev 11916)
@@ -2391,6 +2391,7 @@
 	nodeRegisterType(ntypelist, &sh_node_invert);
 	nodeRegisterType(ntypelist, &sh_node_seprgb);
 	nodeRegisterType(ntypelist, &sh_node_combrgb);
+	nodeRegisterType(ntypelist, &sh_node_hue_sat);
 }
 
 void init_nodesystem(void) 

Modified: branches/imgbrowser-elubie/source/blender/blenlib/intern/Makefile
===================================================================

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list