[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42958] branches/bmesh/blender: svn merge ^/trunk/blender -r42953:42957

[Campbell Barton]

Revision: 42958
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42958
Author:   campbellbarton
Date:     2011-12-29 01:58:47 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42953:42957

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42953

Modified Paths:
--------------
    branches/bmesh/blender/extern/CMakeLists.txt
    branches/bmesh/blender/intern/cycles/CMakeLists.txt
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
    branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h
    branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt
    branches/bmesh/blender/source/blender/python/intern/CMakeLists.txt

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42953
   + /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42957

Modified: branches/bmesh/blender/extern/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/extern/CMakeLists.txt	2011-12-29 01:46:58 UTC (rev 42957)
+++ branches/bmesh/blender/extern/CMakeLists.txt	2011-12-29 01:58:47 UTC (rev 42958)
@@ -45,7 +45,7 @@
 endif()
 
 if(WITH_GAMEENGINE)
-   add_subdirectory(recastnavigation)
+	add_subdirectory(recastnavigation)
 endif()
 
 if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))

Modified: branches/bmesh/blender/intern/cycles/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/CMakeLists.txt	2011-12-29 01:46:58 UTC (rev 42957)
+++ branches/bmesh/blender/intern/cycles/CMakeLists.txt	2011-12-29 01:58:47 UTC (rev 42958)
@@ -36,19 +36,19 @@
 endif()
 
 if(WITH_CYCLES_NETWORK)
-  add_definitions(-DWITH_NETWORK)
+	add_definitions(-DWITH_NETWORK)
 endif()
 
 if(WITH_CYCLES_OSL)
-  add_definitions(-DWITH_OSL)
+	add_definitions(-DWITH_OSL)
 endif()
 
 if(WITH_CYCLES_PARTIO)
-  add_definitions(-DWITH_PARTIO)
+	add_definitions(-DWITH_PARTIO)
 endif()
 
 if(WITH_CYCLES_CUDA_BINARIES)
-  add_definitions(-DWITH_CUDA_BINARIES)
+	add_definitions(-DWITH_CUDA_BINARIES)
 endif()
 
 add_definitions(-DWITH_OPENCL)


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927
   + /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py	2011-12-29 01:46:58 UTC (rev 42957)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py	2011-12-29 01:58:47 UTC (rev 42958)
@@ -560,10 +560,14 @@
         world = context.world
 
         layout.active = world.mist_settings.use_mist
+        row = layout.row()
+        row.prop(world.mist_settings, "falloff")
 
-        row = layout.row()
+        row = layout.row(align=True)
         row.prop(world.mist_settings, "start")
         row.prop(world.mist_settings, "depth")
+        row = layout.row()
+        row.prop(world.mist_settings, "intensity", text="Minimum Intensity")
 
 
 class WORLD_PT_game_physics(WorldButtonsPanel, Panel):

Modified: branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h	2011-12-29 01:46:58 UTC (rev 42957)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h	2011-12-29 01:58:47 UTC (rev 42958)
@@ -300,4 +300,13 @@
 #  define BLI_assert(a) (void)0
 #endif
 
+/* hints for branch pradiction, only use in code that runs a _lot_ where */
+#ifdef __GNUC__
+#  define LIKELY(x)       __builtin_expect(!!(x), 1)
+#  define UNLIKELY(x)     __builtin_expect(!!(x), 0)
+#else
+#  define LIKELY(x)       (x)
+#  define UNLIKELY(x)     (x)
+#endif
+
 #endif // BLI_UTILDEFINES_H

Modified: branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt	2011-12-29 01:46:58 UTC (rev 42957)
+++ branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt	2011-12-29 01:58:47 UTC (rev 42958)
@@ -66,6 +66,7 @@
 	intern/math_base.c
 	intern/math_base_inline.c
 	intern/math_color.c
+	intern/math_color_inline.c
 	intern/math_geom.c
 	intern/math_geom_inline.c
 	intern/math_matrix.c

Modified: branches/bmesh/blender/source/blender/python/intern/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/python/intern/CMakeLists.txt	2011-12-29 01:46:58 UTC (rev 42957)
+++ branches/bmesh/blender/source/blender/python/intern/CMakeLists.txt	2011-12-29 01:58:47 UTC (rev 42958)
@@ -33,7 +33,7 @@
 	../../makesdna
 	../../makesrna
 	../../windowmanager
-    ../../gpu
+	../../gpu
 	../../../../intern/guardedalloc
 )