[Bf-blender-cvs] [b5893b1ba3b] master: Fix (unreported) passing CDLayer 'ID' instead of bitflag to a cdlayer mask!

Bastien Montagne noreply at git.blender.org
Tue Jun 19 16:28:08 CEST 2018


Commit: b5893b1ba3b36ce20575da617e7497a9df9fd72f
Author: Bastien Montagne
Date:   Tue Jun 19 16:25:24 2018 +0200
Branches: master
https://developer.blender.org/rBb5893b1ba3b36ce20575da617e7497a9df9fd72f

Fix (unreported) passing CDLayer 'ID' instead of bitflag to a cdlayer mask!

Probably harmless, since I bet CD_ORIGINDEX is nearly always generated,
but still...

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

M	source/blender/editors/sculpt_paint/paint_image_proj.c

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

diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 2ecd6500fdf..44da12c13e5 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -3434,7 +3434,7 @@ static bool proj_paint_state_dm_init(ProjPaintState *ps)
 	else {
 		ps->dm = mesh_get_derived_final(
 		        ps->scene, ps->ob,
-		        ps->scene->customdata_mask | CD_MASK_MLOOPUV | CD_MASK_MTFACE | (ps->do_face_sel ? CD_ORIGINDEX : 0));
+		        ps->scene->customdata_mask | CD_MASK_MLOOPUV | CD_MASK_MTFACE | (ps->do_face_sel ? CD_MASK_ORIGINDEX : 0));
 		ps->dm_release = false;
 	}



More information about the Bf-blender-cvs mailing list