[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42198] branches/bmesh/blender: svn merge ^/trunk/blender -r42194:42197

[Campbell Barton]

Revision: 42198
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42198
Author:   campbellbarton
Date:     2011-11-27 23:56:29 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42194:42197

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

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
    branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42194
   + /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42197


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-42194
   + /trunk/blender/release:31524-42197

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c	2011-11-27 23:49:09 UTC (rev 42197)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c	2011-11-27 23:56:29 UTC (rev 42198)
@@ -1693,7 +1693,7 @@
 						}
 
 						/* apply weights into a vertex group, if doesnt exists add a new layer */
-						if (defgrp_index >= 0 && !dvert && strlen(surface->output_name)>0)
+						if (defgrp_index >= 0 && !dvert && (surface->output_name[0] != '\0'))
 							dvert = CustomData_add_layer_named(&result->vertData, CD_MDEFORMVERT, CD_CALLOC,
 																NULL, sData->total_points, surface->output_name);
 						if (defgrp_index >= 0 && dvert) {
@@ -2282,10 +2282,10 @@
 							tPoint->quad = (isInside == 2) ? 1 : 0;		/* quad or tri part*/
 
 							/* save vertex indexes	*/
-							tPoint->v1 = (isInside == 2) ? mface[i].v1 : mface[i].v1;
+							tPoint->v1 = mface[i].v1; /* (isInside == 2) ? mface[i].v1 : mface[i].v1; */ /* same! */
 							tPoint->v2 = (isInside == 2) ? mface[i].v3 : mface[i].v2;
 							tPoint->v3 = (isInside == 2) ? mface[i].v4 : mface[i].v3;
-							
+
 							sample = 5;	/* make sure we exit sample loop as well */
 							break;
 						}

Modified: branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c	2011-11-27 23:49:09 UTC (rev 42197)
+++ branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c	2011-11-27 23:56:29 UTC (rev 42198)
@@ -3795,6 +3795,8 @@
 			}
 
 			if (sel == -1) {
+				int i;
+
 				/* if the click didn't select anything, check if it's clicked on the 
 				 * curve itself, and if so, add a point */
 				fx= ((float)mx - but->x1)/zoomx + offsx;
@@ -3804,8 +3806,10 @@
 
 				/* loop through the curve segment table and find what's near the mouse.
 				 * 0.05 is kinda arbitrary, but seems to be what works nicely. */
-				for(a=0; a<=CM_TABLE; a++) {			
-					if ( ( fabs(fx - cmp[a].x) < (0.05) ) && ( fabs(fy - cmp[a].y) < (0.05) ) ) {
+				for(i=0; i<=CM_TABLE; i++) {
+					if ( (fabsf(fx - cmp[i].x) < 0.05f) &&
+					     (fabsf(fy - cmp[i].y) < 0.05f))
+					{
 					
 						curvemap_insert(cuma, fx, fy);
 						curvemapping_changed(cumap, 0);


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-42194
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-42197

Modified: branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c	2011-11-27 23:49:09 UTC (rev 42197)
+++ branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c	2011-11-27 23:56:29 UTC (rev 42198)
@@ -309,8 +309,9 @@
 			if (debugSDNA > 3) printf("seen %c ( %d) \n", str[j], str[j]);
 			j++;
 		}
-		if (debugSDNA > 3) printf("seen %c ( %d) \n", str[j], str[j]); 
-		if (debugSDNA > 3) printf("special after offset %d\n", j); 
+		if (debugSDNA > 3) printf("seen %c ( %d) \n"
+		                          "special after offset%d\n",
+		                          str[j], str[j], j);
 				
 		if (!isfuncptr) {
 			/* multidimensional array pointer case */

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c	2011-11-27 23:49:09 UTC (rev 42197)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c	2011-11-27 23:56:29 UTC (rev 42198)
@@ -572,6 +572,7 @@
 	/* unused */
 	(void)fluidmd;
 	(void)scene;
+	(void)ob;
 	(void)dm;
 	(void)useRenderParams;
 	return NULL;