[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40079] branches/soc-2010-nicks: svn merge -r 40061:40078 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

[Benoit Bolsee]

Revision: 40079
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40079
Author:   ben2610
Date:     2011-09-09 19:30:33 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
svn merge -r 40061:40078 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/soc-2010-nicks/extern/eltopo/common/bfstream.h
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2010-nicks/source/blender/blenlib/BLI_math_inline.h
    branches/soc-2010-nicks/source/blender/editors/interface/interface_widgets.c
    branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2010-nicks/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2010-nicks/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2010-nicks/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2010-nicks/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2010-nicks/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2010-nicks/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2010-nicks/source/blender/makesdna/DNA_outliner_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_space_types.h
    branches/soc-2010-nicks/source/blender/python/intern/gpu.c

Property Changed:
----------------
    branches/soc-2010-nicks/
    branches/soc-2010-nicks/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2010-nicks/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2010-nicks/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2010-nicks/source/blender/editors/render/render_update.c
    branches/soc-2010-nicks/source/blender/editors/space_outliner/
    branches/soc-2010-nicks/source/blender/editors/uvedit/uvedit_buttons.c
    branches/soc-2010-nicks/source/blender/python/generic/


Property changes on: branches/soc-2010-nicks
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:34794-40061
   + /trunk/blender:34794-40078

Modified: branches/soc-2010-nicks/extern/eltopo/common/bfstream.h
===================================================================
--- branches/soc-2010-nicks/extern/eltopo/common/bfstream.h	2011-09-09 16:38:15 UTC (rev 40078)
+++ branches/soc-2010-nicks/extern/eltopo/common/bfstream.h	2011-09-09 19:30:33 UTC (rev 40079)
@@ -6,7 +6,16 @@
 #include <cstdlib>
 #include <fstream>
 
+// __BIG_ENDIAN__ or __LITTLE_ENDIAN__ should be defined before the compiler gets here
+// true in gcc 4.2 but may not be guarenteed between compilers/versions ??
+
+// list taken from source/blender/blenkernel/BKE_utildefines.h
+#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
+#define __BIG_ENDIAN__
+#else
 #define __LITTLE_ENDIAN__
+#endif
+
 #ifdef __BIG_ENDIAN__
 #ifdef __LITTLE_ENDIAN__
 #error Cannot be both big and little endian


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36570-39975,40062-40078


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36570-39975
   + /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36570-39975,40062-40078

Modified: branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-09-09 16:38:15 UTC (rev 40078)
+++ branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-09-09 19:30:33 UTC (rev 40079)
@@ -768,9 +768,9 @@
             col = row.column()
 
             if brush.use_texture_overlay:
-                col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='MUTE_IPO_OFF')
+                col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF')
             else:
-                col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='MUTE_IPO_ON')
+                col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON')
 
             col.active = tex_slot.map_mode in {'FIXED', 'TILED'}
 

Modified: branches/soc-2010-nicks/source/blender/blenlib/BLI_math_inline.h
===================================================================
--- branches/soc-2010-nicks/source/blender/blenlib/BLI_math_inline.h	2011-09-09 16:38:15 UTC (rev 40078)

@@ Diff output truncated at 10240 characters. @@