[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26111] trunk/blender: - AIX ifdef' s so windows works, cant test but this seems the most used define.

Campbell Barton ideasman42 at gmail.com
Tue Jan 19 16:57:02 CET 2010


Revision: 26111
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26111
Author:   campbellbarton
Date:     2010-01-19 16:57:02 +0100 (Tue, 19 Jan 2010)

Log Message:
-----------
- AIX ifdef's so windows works, cant test but this seems the most used define. might need to add to buildsystem config.
- transform default scale was too hight, calls to random were inconsistant. (fault of own modif's)
- cmake openal include was added twice on recent commit.

Modified Paths:
--------------
    trunk/blender/intern/audaspace/CMakeLists.txt
    trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    trunk/blender/intern/string/intern/STR_String.cpp
    trunk/blender/release/scripts/op/object_randomize_transform.py

Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt	2010-01-19 15:46:07 UTC (rev 26110)
+++ trunk/blender/intern/audaspace/CMakeLists.txt	2010-01-19 15:57:02 UTC (rev 26111)
@@ -20,7 +20,7 @@
 #
 # ***** END LGPL LICENSE BLOCK *****
 
-SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC} ${OPENAL_INCLUDE_DIR})
+SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC})
 
 FILE(GLOB SRC intern/*.cpp intern/*.h FX/*.cpp SRC/*.cpp)
 

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2010-01-19 15:46:07 UTC (rev 26110)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2010-01-19 15:57:02 UTC (rev 26111)
@@ -35,7 +35,7 @@
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 
-#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__)
+#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) || defined (_AIX)
 #include <strings.h>
 #endif
 

Modified: trunk/blender/intern/string/intern/STR_String.cpp
===================================================================
--- trunk/blender/intern/string/intern/STR_String.cpp	2010-01-19 15:46:07 UTC (rev 26110)
+++ trunk/blender/intern/string/intern/STR_String.cpp	2010-01-19 15:57:02 UTC (rev 26111)
@@ -39,11 +39,9 @@
 #include <stdlib.h> 
 #include <ctype.h>
 #include <string.h>
-
-#ifndef WIN32
+#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) || defined (_AIX)
 #include <strings.h>
 #endif
-
 #include "STR_String.h"
 
 /*-------------------------------------------------------------------------------------------------

Modified: trunk/blender/release/scripts/op/object_randomize_transform.py
===================================================================
--- trunk/blender/release/scripts/op/object_randomize_transform.py	2010-01-19 15:46:07 UTC (rev 26110)
+++ trunk/blender/release/scripts/op/object_randomize_transform.py	2010-01-19 15:57:02 UTC (rev 26111)
@@ -52,6 +52,7 @@
 
             if scale_even:
                 sca_x = sca_y = sca_z = uniform(scale[0], - scale[0])
+                uniform(0.0, 0.0), uniform(0.0, 0.0)
             else:
                 sca_x, sca_y, sca_z = rand_vec(scale)
 
@@ -111,7 +112,7 @@
 
     scale_min = FloatProperty(name="Minimun Scale Factor",
         description="Lowest scale percentage possible",
-        default=15.0, min=-1.0, max=1.0, precision=3)
+        default=0.15, min=-1.0, max=1.0, precision=3)
 
     scale = FloatVectorProperty(name="Scale",
         description="Maximum scale randomization over each axis",





More information about the Bf-blender-cvs mailing list