[Bf-blender-cvs] [b22175735dd] soc-2019-bevel-profiles: Merge branch 'master' into soc-2019-bevel-profiles

Hans Goudey noreply at git.blender.org
Tue Sep 24 02:26:11 CEST 2019


Commit: b22175735dd6f7517b00fb31a0ef56c16e2677cb
Author: Hans Goudey
Date:   Mon Sep 23 14:12:07 2019 -0400
Branches: soc-2019-bevel-profiles
https://developer.blender.org/rBb22175735dd6f7517b00fb31a0ef56c16e2677cb

Merge branch 'master' into soc-2019-bevel-profiles

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



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

diff --cc source/blender/modifiers/intern/MOD_bevel.c
index 982bf7e6cb9,0c00bb572be..b26e33cdff8
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@@ -219,12 -210,9 +219,12 @@@ static Mesh *applyModifier(ModifierDat
                  miter_outer,
                  miter_inner,
                  spread,
 -                mesh->smoothresh);
 +                mesh->smoothresh,
 +                use_custom_profile,
 +                bmd->prwdgt,
 +                vmesh_method);
  
-   result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL);
+   result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL, mesh);
  
    /* Make sure we never alloc'd these. */
    BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && bm->ftoolflagpool == NULL);



More information about the Bf-blender-cvs mailing list