[Bf-blender-cvs] [990fab7] master: Cleanup: fix inconsitency in dynamicPaint_outputLayerExists()

Bastien Montagne noreply at git.blender.org
Fri May 13 12:07:42 CEST 2016


Commit: 990fab73eaf10688b65a4344bcdf5b84ded2ec85
Author: Bastien Montagne
Date:   Thu May 12 13:15:55 2016 +0200
Branches: master
https://developer.blender.org/rB990fab73eaf10688b65a4344bcdf5b84ded2ec85

Cleanup: fix inconsitency in dynamicPaint_outputLayerExists()

Dyna WPaint indeed only uses first output layer, but better be consistent in those cases...

===================================================================

M	source/blender/blenkernel/intern/dynamicpaint.c

===================================================================

diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 92de1eb..1bed137 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -306,7 +306,7 @@ bool dynamicPaint_outputLayerExists(struct DynamicPaintSurface *surface, Object
 			return (CustomData_get_named_layer_index(&me->ldata, CD_MLOOPCOL, name) != -1);
 		}
 		else if (surface->type == MOD_DPAINT_SURFACE_T_WEIGHT) {
-			return (defgroup_name_index(ob, surface->output_name) != -1);
+			return (defgroup_name_index(ob, name) != -1);
 		}
 	}




More information about the Bf-blender-cvs mailing list