[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39766] branches/bmesh/blender: svn merge -r39763:39765 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Mon Aug 29 03:08:35 CEST 2011
Revision: 39766
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39766
Author: campbellbarton
Date: 2011-08-29 01:08:34 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
svn merge -r39763:39765 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39763
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
branches/bmesh/blender/source/blender/imbuf/intern/indexer.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/render/render_update.c
branches/bmesh/blender/source/blender/editors/space_outliner/
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-39762
+ /trunk/blender:31524-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39765
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39762
+ /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39765
Modified: branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c 2011-08-29 01:05:35 UTC (rev 39765)
+++ branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c 2011-08-29 01:08:34 UTC (rev 39766)
@@ -40,7 +40,7 @@
#include "BLO_sys_types.h" // for intptr_t support
/***/
-static unsigned int hashsizes[]= {
+unsigned int hashsizes[]= {
5, 11, 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209,
16411, 32771, 65537, 131101, 262147, 524309, 1048583, 2097169,
4194319, 8388617, 16777259, 33554467, 67108879, 134217757,
Property changes on: branches/bmesh/blender/source/blender/editors/render/render_update.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/source/blender/editors/render/render_update.c:36801-39762
+ /trunk/blender/source/blender/editors/render/render_update.c:36801-39765
Property changes on: branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-39762
+ /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-39765
Property changes on: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/source/blender/editors/uvedit/uvedit_buttons.c:36530-39762
+ /trunk/blender/source/blender/editors/uvedit/uvedit_buttons.c:36530-39765
Modified: branches/bmesh/blender/source/blender/imbuf/intern/indexer.c
===================================================================
--- branches/bmesh/blender/source/blender/imbuf/intern/indexer.c 2011-08-29 01:05:35 UTC (rev 39765)
+++ branches/bmesh/blender/source/blender/imbuf/intern/indexer.c 2011-08-29 01:08:34 UTC (rev 39766)
@@ -51,8 +51,11 @@
static int proxy_sizes[] = { IMB_PROXY_25, IMB_PROXY_50, IMB_PROXY_75,
IMB_PROXY_100 };
static float proxy_fac[] = { 0.25, 0.50, 0.75, 1.00 };
+
+#ifdef WITH_FFMPEG
static int tc_types[] = { IMB_TC_RECORD_RUN, IMB_TC_FREE_RUN,
IMB_TC_INTERPOLATED_REC_DATE_FREE_RUN };
+#endif
#define INDEX_FILE_VERSION 1
@@ -398,7 +401,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list