[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48992] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48986:48991

Campbell Barton ideasman42 at gmail.com
Tue Jul 17 11:58:20 CEST 2012 

Revision: 48992
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48992
Author:   campbellbarton
Date:     2012-07-17 09:58:20 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48986:48991

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

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/bsp/intern/BSP_CSGMesh.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_differential.h
    branches/soc-2011-tomato/intern/dualcon/intern/octree.cpp
    branches/soc-2011-tomato/intern/itasc/Scene.cpp
    branches/soc-2011-tomato/intern/raskter/raskter.c
    branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/group.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.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_geom.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_structure.h
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bevel.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/BME_bevel.c
    branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryProxy.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingBlurOperation.h
    branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
    branches/soc-2011-tomato/source/blender/editors/object/object_group.c
    branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-tomato/source/blender/imbuf/IMB_moviecache.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/jp2.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/jpeg.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/scaling.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2011-tomato/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2011-tomato/source/blender/makesrna/RNA_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2011-tomato/source/blender/python/generic/idprop_py_api.c
    branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_operator.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-tomato/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2011-tomato/source/blender/quicktime/apple/qtkit_import.m
    branches/soc-2011-tomato/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2011-tomato/source/blender/render/intern/include/zbuf.h
    branches/soc-2011-tomato/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
    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/renderdatabase.c
    branches/soc-2011-tomato/source/blender/render/intern/source/sunsky.c
    branches/soc-2011-tomato/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_KeyboardSensor.h

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-48986
   + /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-48991

Modified: branches/soc-2011-tomato/intern/bsp/intern/BSP_CSGMesh.cpp
===================================================================
--- branches/soc-2011-tomato/intern/bsp/intern/BSP_CSGMesh.cpp	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/intern/bsp/intern/BSP_CSGMesh.cpp	2012-07-17 09:58:20 UTC (rev 48992)
@@ -486,7 +486,7 @@
 		BSP_MEdge &e = edges[*e_it]; 
 
 		// iterate through the faces of this edge - push unselected
-		// edges to ouput and then select the edge
+		// edges to output and then select the edge
 
 		vector<BSP_FaceInd>::const_iterator e_faces_end = e.m_faces.end();
 		vector<BSP_FaceInd>::iterator e_faces_it = e.m_faces.begin();

Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_differential.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_differential.h	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_differential.h	2012-07-17 09:58:20 UTC (rev 48992)
@@ -22,7 +22,7 @@
 
 __device void differential_transfer(differential3 *dP_, const differential3 dP, float3 D, const differential3 dD, float3 Ng, float t)
 {
-	/* ray differential transfer through homogenous medium, to
+	/* ray differential transfer through homogeneous medium, to
 	 * compute dPdx/dy at a shading point from the incoming ray */
 
 	float3 tmp = D/dot(D, Ng);

Modified: branches/soc-2011-tomato/intern/dualcon/intern/octree.cpp
===================================================================
--- branches/soc-2011-tomato/intern/dualcon/intern/octree.cpp	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/intern/dualcon/intern/octree.cpp	2012-07-17 09:58:20 UTC (rev 48992)
@@ -54,7 +54,7 @@
 	   After playing around with this option, the only case I could
 	   find where this option gives different results is on
 	   relatively thin corners. Sometimes along these corners two
-	   vertices from seperate sides will be placed in the same
+	   vertices from separate sides will be placed in the same
 	   position, so hole gets filled with a 5-sided face, where two
 	   of those vertices are in the same 3D location. If
 	   `use_manifold' is disabled, then the modifier doesn't

Modified: branches/soc-2011-tomato/intern/itasc/Scene.cpp
===================================================================
--- branches/soc-2011-tomato/intern/itasc/Scene.cpp	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/intern/itasc/Scene.cpp	2012-07-17 09:58:20 UTC (rev 48992)
@@ -40,7 +40,7 @@
 	{
 		q_nr += m_qrange.start;
 		project(m_scene->m_Wq, Range(q_nr, ndof), m_qrange).setZero();
-		// update the ouput vector so that the movement of this joint will be 
+		// update the ouput vector so that the movement of this joint will be
 		// taken into account and we can put the joint back in its initial position
 		// which means that the jacobian doesn't need to be changed
 		for (unsigned int i=0 ;i<ndof ; ++i, ++q_nr) {

Modified: branches/soc-2011-tomato/intern/raskter/raskter.c
===================================================================
--- branches/soc-2011-tomato/intern/raskter/raskter.c	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/intern/raskter/raskter.c	2012-07-17 09:58:20 UTC (rev 48992)
@@ -461,7 +461,7 @@
     //unsigned int gradientFillOffset;
     float t;
     float ud;                // ud = unscaled edge distance
-    float dmin;              // dmin = minimun edge distance
+    float dmin;              // dmin = minimum edge distance
     float odist;                    // odist = current outer edge distance
     float idist;                    // idist = current inner edge distance
     float dx;                         // dx = X-delta (used for distance proportion calculation)
@@ -643,7 +643,7 @@
                         /*
                          * Note once again that since we are using reciprocals of distance values our
                          * proportion is already the correct intensity, and does not need to be
-                         * subracted from 1.0 like it would have if we used real distances.
+                         * subtracted from 1.0 like it would have if we used real distances.
                          */
 #else
                         clup[0]=t;

Modified: branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D.h
===================================================================
--- branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D.h	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D.h	2012-07-17 09:58:20 UTC (rev 48992)
@@ -105,7 +105,7 @@
 		float* _xForce;
 		float* _yForce;
 		float* _zForce;
-		unsigned char*  _obstacles; /* only used (usefull) for static obstacles like domain boundaries */
+		unsigned char*  _obstacles; /* only used (useful) for static obstacles like domain boundaries */
 		unsigned char*  _obstaclesAnim;
 
 		// Required for proper threading:

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h	2012-07-17 09:58:20 UTC (rev 48992)
@@ -72,9 +72,11 @@
 float (*BKE_mask_spline_differentiate(struct MaskSpline *spline, int *tot_diff_point))[2];
 float (*BKE_mask_spline_feather_differentiated_points(struct MaskSpline *spline, int *tot_feather_point))[2];
 
-float (*BKE_mask_spline_differentiate_with_resolution_ex(struct MaskSpline *spline, const int resol, int *tot_diff_point))[2];
+float (*BKE_mask_spline_differentiate_with_resolution_ex(struct MaskSpline *spline, int *tot_diff_point,
+                                                         const int resol))[2];
 float (*BKE_mask_spline_differentiate_with_resolution(struct MaskSpline *spline, int width, int height, int *tot_diff_point))[2];
-float (*BKE_mask_spline_feather_differentiated_points_with_resolution_ex(struct MaskSpline *spline, const int resol, int *tot_feather_point))[2];
+float (*BKE_mask_spline_feather_differentiated_points_with_resolution_ex(struct MaskSpline *spline, int *tot_feather_point,
+                                                                         const int resol, const int do_collapse))[2];
 float (*BKE_mask_spline_feather_differentiated_points_with_resolution(struct MaskSpline *spline, int width, int height, int *tot_feather_point))[2];
 
 float (*BKE_mask_spline_feather_points(struct MaskSpline *spline, int *tot_feather_point))[2];

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c	2012-07-17 09:58:20 UTC (rev 48992)
@@ -1588,7 +1588,7 @@
                       float *labda, float *mu, float vec[3])
 {
 	/* return:
-	 * -1: colliniar
+	 * -1: collinear
 	 *  0: no intersection of segments
 	 *  1: exact intersection of segments
 	 *  2: cross-intersection of segments

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/fmodifier.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/fmodifier.c	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/fmodifier.c	2012-07-17 09:58:20 UTC (rev 48992)
@@ -1298,7 +1298,7 @@
 	return evaltime;
 }
 
-/* Evalautes the given set of F-Curve Modifiers using the given data
+/* Evaluates the given set of F-Curve Modifiers using the given data
  * Should only be called after evaluate_time_fmodifiers() has been called...
  */
 void evaluate_value_fmodifiers(ListBase *modifiers, FCurve *fcu, float *cvalue, float evaltime)

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/group.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/group.c	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/group.c	2012-07-17 09:58:20 UTC (rev 48992)
@@ -345,7 +345,7 @@
 	
 #if 0 /* warning, isn't clearing the recalc flag on the object which causes it to run all the time,
 	   * not just on frame change.
-	   * This isn't working because the animation data is only re-evalyated on frame change so commenting for now
+	   * This isn't working because the animation data is only re-evaluated on frame change so commenting for now
 	   * but when its enabled at some point it will need to be changed so as not to update so much - campbell */
 
 	/* if animated group... */

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c	2012-07-17 09:56:10 UTC (rev 48991)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c	2012-07-17 09:58:20 UTC (rev 48992)
@@ -185,7 +185,7 @@
 /* create long vector */
 DO_INLINE lfVector *create_lfvector(unsigned int verts)
 {
-	/* TODO: check if memory allocation was successfull */
+	/* TODO: check if memory allocation was successful */

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list