[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49362] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49333:49361

Campbell Barton ideasman42 at gmail.com
Sun Jul 29 20:48:34 CEST 2012


Revision: 49362
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49362
Author:   campbellbarton
Date:     2012-07-29 18:48:34 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49333:49361

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

Modified Paths:
--------------
    branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.2.py
    branches/soc-2011-tomato/doc/python_api/rst/info_best_practice.rst
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastContour.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMesh.cpp
    branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
    branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp
    branches/soc-2011-tomato/intern/cycles/util/util_path.cpp
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/check_po.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/clean_po.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/merge_po.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_branches.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_mo.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_po.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_pot.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/update_trunk.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
    branches/soc-2011-tomato/release/scripts/modules/console_python.py
    branches/soc-2011-tomato/release/scripts/modules/sys_info.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_speaker.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-tomato/source/blender/avi/intern/avi.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/boids.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/ocean.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/writeframeserver.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_args.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/DLRB_tree.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_base_inline.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/pbvh.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/voronoi.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.h
    branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
    branches/soc-2011-tomato/source/blender/editors/screen/glutil.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-tomato/source/blender/editors/space_action/space_action.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_toolbar.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_select.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-tomato/source/blender/gpu/GPU_draw.h
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-tomato/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/soc-2011-tomato/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c
    branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_ocean.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/soc-2011-tomato/source/blender/render/intern/raytrace/bvh.h
    branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
    branches/soc-2011-tomato/source/blender/render/intern/source/rayshade.c
    branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
    branches/soc-2011-tomato/source/blender/render/intern/source/sss.c
    branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/soc-2011-tomato/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2011-tomato/source/tools/check_style_c.py
    branches/soc-2011-tomato/source/tools/spell_check_source.py

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49333
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49361

Modified: branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.2.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.2.py	2012-07-29 18:14:20 UTC (rev 49361)
+++ branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.2.py	2012-07-29 18:48:34 UTC (rev 49362)
@@ -19,4 +19,4 @@
 
 # group add popup
 import bpy
-bpy.ops.object.group_instance_add('INVOKE_DEFAULT')
\ No newline at end of file
+bpy.ops.object.group_instance_add('INVOKE_DEFAULT')

Modified: branches/soc-2011-tomato/doc/python_api/rst/info_best_practice.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/info_best_practice.rst	2012-07-29 18:14:20 UTC (rev 49361)
+++ branches/soc-2011-tomato/doc/python_api/rst/info_best_practice.rst	2012-07-29 18:48:34 UTC (rev 49362)
@@ -56,9 +56,71 @@
 User Interface Layout
 =====================
 
-TODO: Thomas
+Some notes to keep in mind when writing UI layouts:
 
+* UI code is quite simple. Layout declarations are there to easily create a decent layout. 
 
+  General rule here: If you need more code for the layout declaration, then for the actual properties, you do it wrong. 
+  
+Example layouts:
+
+* layout()
+
+  The basic layout is a simple Top -> Bottom layout. 
+  
+  .. code-block:: python
+
+	 layout.prop()
+	 layout.prop()
+
+* layout.row()
+
+  Use row(), when you want more than 1 propertey in one line. 
+  
+  .. code-block:: python
+	 
+	 row = layout.row()
+	 row.prop()
+	 row.prop()
+
+* layout.column()
+
+  Use column(), when you want your properties in a column.
+  
+  .. code-block:: python
+  
+	 col = layout.column()
+	 col.prop()
+	 col.prop()
+
+* layout.split()
+
+  This can be used to create more complex layouts. For example you can split the layout and create two column() layouts next to each other.
+  Don't use split, when you simply want two properties in a row. Use row() for that.
+  
+  .. code-block:: python
+  
+	 split = layout.split()
+	 
+	 col = split.column()
+	 col.prop()
+	 col.prop()
+	 
+	 col = split.column()
+	 col.prop()
+	 col.prop()
+	 
+Declaration names:
+
+Try to only use these variable names for layout declarations:
+
+* row for a row() layout
+* col for a column() layout
+* split for a split() layout
+* flow for a column_flow() layout
+* sub for a sub layout (a column inside a column for example)
+
+
 Script Efficiency
 =================
 

Modified: branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastContour.cpp
===================================================================
--- branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastContour.cpp	2012-07-29 18:14:20 UTC (rev 49361)
+++ branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastContour.cpp	2012-07-29 18:48:34 UTC (rev 49362)
@@ -321,7 +321,7 @@
 
 		// Find maximum deviation from the segment.
 		float maxd = 0;
-		int maxi = -1;
+		int i_max = -1;
 		int ci, cinc, endi;
 		
 		// Traverse the segment in lexilogical order so that the
@@ -350,7 +350,7 @@
 				if (d > maxd)
 				{
 					maxd = d;
-					maxi = ci;
+					i_max = ci;
 				}
 				ci = (ci+cinc) % pn;
 			}
@@ -359,7 +359,7 @@
 		
 		// If the max deviation is larger than accepted error,
 		// add new point, else continue to next segment.
-		if (maxi != -1 && maxd > (maxError*maxError))
+		if (i_max != -1 && maxd > (maxError*maxError))
 		{
 			// Add space for the new point.
 			simplified.resize(simplified.size()+4);
@@ -372,10 +372,10 @@
 				simplified[j*4+3] = simplified[(j-1)*4+3];
 			}
 			// Add the point.
-			simplified[(i+1)*4+0] = points[maxi*4+0];
-			simplified[(i+1)*4+1] = points[maxi*4+1];
-			simplified[(i+1)*4+2] = points[maxi*4+2];
-			simplified[(i+1)*4+3] = maxi;
+			simplified[(i+1)*4+0] = points[i_max*4+0];
+			simplified[(i+1)*4+1] = points[i_max*4+1];
+			simplified[(i+1)*4+2] = points[i_max*4+2];
+			simplified[(i+1)*4+3] = i_max;
 		}
 		else
 		{
@@ -399,7 +399,7 @@
 			const int bi = simplified[ii*4+3];
 
 			// Find maximum deviation from the segment.
-			int maxi = -1;
+			int i_max = -1;
 			int ci = (ai+1) % pn;
 
 			// Tessellate only outer edges or edges between areas.
@@ -423,19 +423,19 @@
 					if (bx > ax || (bx == ax && bz > az))
 					{
 						const int n = bi < ai ? (bi+pn - ai) : (bi - ai);
-						maxi = (ai + n/2) % pn;
+						i_max = (ai + n/2) % pn;
 					}
 					else
 					{
 						const int n = bi < ai ? (bi+pn - ai) : (bi - ai);
-						maxi = (ai + (n+1)/2) % pn;
+						i_max = (ai + (n+1)/2) % pn;
 					}
 				}
 			}
 			
 			// If the max deviation is larger than accepted error,
 			// add new point, else continue to next segment.
-			if (maxi != -1)
+			if (i_max != -1)
 			{
 				// Add space for the new point.
 				simplified.resize(simplified.size()+4);
@@ -448,10 +448,10 @@
 					simplified[j*4+3] = simplified[(j-1)*4+3];
 				}
 				// Add the point.
-				simplified[(i+1)*4+0] = points[maxi*4+0];
-				simplified[(i+1)*4+1] = points[maxi*4+1];
-				simplified[(i+1)*4+2] = points[maxi*4+2];
-				simplified[(i+1)*4+3] = maxi;
+				simplified[(i+1)*4+0] = points[i_max*4+0];
+				simplified[(i+1)*4+1] = points[i_max*4+1];
+				simplified[(i+1)*4+2] = points[i_max*4+2];
+				simplified[(i+1)*4+3] = i_max;
 			}
 			else
 			{

Modified: branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMesh.cpp
===================================================================
--- branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMesh.cpp	2012-07-29 18:14:20 UTC (rev 49361)
+++ branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMesh.cpp	2012-07-29 18:48:34 UTC (rev 49362)
@@ -305,7 +305,7 @@
 	while (n > 3)
 	{
 		int minLen = -1;
-		int mini = -1;
+		int i_min = -1;
 		for (int i = 0; i < n; i++)
 		{
 			int i1 = next(i, n);
@@ -321,12 +321,12 @@
 				if (minLen < 0 || len < minLen)
 				{
 					minLen = len;
-					mini = i;
+					i_min = i;
 				}
 			}
 		}
 		
-		if (mini == -1)
+		if (i_min == -1)
 		{
 			// Should not happen.
 /*			printf("mini == -1 ntris=%d n=%d\n", ntris, n);
@@ -338,7 +338,7 @@
 			return -ntris;
 		}
 		
-		int i = mini;
+		int i = i_min;
 		int i1 = next(i, n);
 		int i2 = next(i1, n);
 		

Modified: branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
===================================================================
--- branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp	2012-07-29 18:14:20 UTC (rev 49361)
+++ branches/soc-2011-tomato/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp	2012-07-29 18:48:34 UTC (rev 49362)
@@ -579,23 +579,23 @@
 				const float* vb = &edge[b*3];
 				// Find maximum deviation along the segment.
 				float maxd = 0;
-				int maxi = -1;
+				int i_max = -1;
 				for (int m = a+1; m < b; ++m)
 				{
 					float d = distancePtSeg(&edge[m*3],va,vb);
 					if (d > maxd)
 					{
 						maxd = d;
-						maxi = m;
+						i_max = m;
 					}
 				}
 				// If the max deviation is larger than accepted error,
 				// add new point, else continue to next segment.
-				if (maxi != -1 && maxd > rcSqr(sampleMaxError))
+				if (i_max != -1 && maxd > rcSqr(sampleMaxError))
 				{
 					for (int m = nidx; m > k; --m)
 						idx[m] = idx[m-1];
-					idx[k+1] = maxi;
+					idx[k+1] = i_max;
 					nidx++;
 				}
 				else

Modified: branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp	2012-07-29 18:14:20 UTC (rev 49361)
+++ branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp	2012-07-29 18:48:34 UTC (rev 49362)
@@ -26,6 +26,8 @@
 #include "util_path.h"
 #include "util_types.h"
 
+#include <boost/version.hpp>
+
 #if (BOOST_VERSION < 104400)
 #  define BOOST_FILESYSTEM_VERSION 2
 #endif

Modified: branches/soc-2011-tomato/intern/cycles/util/util_path.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/util/util_path.cpp	2012-07-29 18:14:20 UTC (rev 49361)
+++ branches/soc-2011-tomato/intern/cycles/util/util_path.cpp	2012-07-29 18:48:34 UTC (rev 49362)
@@ -26,6 +26,8 @@
 
 #include <stdio.h>
 
+#include <boost/version.hpp>
+
 #if (BOOST_VERSION < 104400)
 #  define BOOST_FILESYSTEM_VERSION 2
 #endif

Modified: branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py	2012-07-29 18:14:20 UTC (rev 49361)
+++ branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py	2012-07-29 18:48:34 UTC (rev 49362)
@@ -270,7 +270,6 @@
     walk_keymap_hierarchy(KM_HIERARCHY, "KM_HIERARCHY")
 
 
-
 def dump_messages_pytext(messages, check_ctxt):
     """ dumps text inlined in the python user interface: eg.
 
@@ -291,7 +290,7 @@
 
     # Break recursive nodes look up on some kind of nodes.
     # E.g. we don’t want to get strings inside subscripts (blah["foo"])!
-    stopper_nodes = {ast.Subscript,}
+    stopper_nodes = {ast.Subscript, }
 
     for func_id, func in bpy.types.UILayout.bl_rna.functions.items():
         # check it has a 'text' argument

Modified: branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/check_po.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/check_po.py	2012-07-29 18:14:20 UTC (rev 49361)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list