Commit: 83233d26055beaa457fe0c42d3389fc50dab5a2a Author: Antonio Vazquez Date: Fri Mar 6 08:41:34 2020 +0100 Branches: greasepencil-object https://developer.blender.org/rB83233d26055beaa457fe0c42d3389fc50dab5a2a
Merge branch 'master' into greasepencil-object Conflicts: source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c source/blender/editors/gpencil/gpencil_paint.c source/blender/editors/gpencil/gpencil_sculpt_paint.c source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c =================================================================== =================================================================== diff --cc source/blender/editors/gpencil/gpencil_data.c index cac321801b2,a8c3fb02e11..9b33e999a25 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@@ -2619,12 -2320,12 +2619,12 @@@ int ED_gpencil_join_objects_exec(bConte for (bDeformGroup *dg = ob_iter->defbase.first; dg; dg = dg->next) { bDeformGroup *vgroup = MEM_dupallocN(dg); int idx = BLI_listbase_count(&ob_active->defbase); - defgroup_unique_name(vgroup, ob_active); + BKE_object_defgroup_unique_name(vgroup, ob_active); BLI_addtail(&ob_active->defbase, vgroup); /* update vertex groups in strokes in original data */ - for (bGPDlayer *gpl_src = gpd->layers.first; gpl_src; gpl_src = gpl_src->next) { - for (bGPDframe *gpf = gpl_src->frames.first; gpf; gpf = gpf->next) { - for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) { + LISTBASE_FOREACH (bGPDlayer *, gpl_src, &gpd->layers) { + LISTBASE_FOREACH (bGPDframe *, gpf, &gpl_src->frames) { + LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) { MDeformVert *dvert; int i; for (i = 0, dvert = gps->dvert; i < gps->totpoints; i++, dvert++) { diff --cc source/blender/editors/gpencil/gpencil_fill.c index 4a466147cea,44ff11aa84a..8aa186957fe --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@@ -1149,11 -1091,8 +1149,11 @@@ static void gpencil_stroke_from_buffer( pt->strength = 1.0f; pt->time = 0.0f; + /* Apply the vertex color to point. */ + ED_gpencil_point_vertex_color_set(ts, brush, pt); + if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS) && (have_weight)) { - MDeformWeight *dw = defvert_verify_index(dvert, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert, def_nr); if (dw) { dw->weight = ts->vgroup_weight; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs