[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58029] trunk/blender/source/blender/ blenkernel/intern/dynamicpaint.c: only make dynamic paint tag normals as dirty if it moves vertices.

Campbell Barton ideasman42 at gmail.com
Sat Jul 6 03:42:46 CEST 2013


Revision: 58029
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58029
Author:   campbellbarton
Date:     2013-07-06 01:42:45 +0000 (Sat, 06 Jul 2013)
Log Message:
-----------
only make dynamic paint tag normals as dirty if it moves vertices.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c

Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c	2013-07-06 00:52:50 UTC (rev 58028)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c	2013-07-06 01:42:45 UTC (rev 58029)
@@ -1698,7 +1698,7 @@
 	if (pmd->canvas && !(pmd->canvas->flags & MOD_DPAINT_BAKING)) {
 
 		DynamicPaintSurface *surface;
-		int update_normals = 0;
+		bool update_normals = false;
 
 		/* loop through surfaces */
 		for (surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
@@ -1881,19 +1881,21 @@
 							normal_short_to_float_v3(normal, mvert[i].no);
 							madd_v3_v3fl(mvert[i].co, normal, wPoint[i].height);
 						}
-						update_normals = 1;
+						update_normals = true;
 					}
 
 					/* displace */
 					if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE) {
 						dynamicPaint_applySurfaceDisplace(surface, result);
-						update_normals = 1;
+						update_normals = true;
 					}
 				}
 			}
 		}
 
-		result->dirty |= DM_DIRTY_NORMALS;
+		if (update_normals) {
+			result->dirty |= DM_DIRTY_NORMALS;
+		}
 	}
 	/* make a copy of dm to use as brush data */
 	if (pmd->brush) {




More information about the Bf-blender-cvs mailing list