Commit: 190d1b2f7ae04cbe244b581f78dfdeb3387c9ea0
Author: Rohan Rathi
Date: Tue Jul 3 19:01:20 2018 +0530
Branches: soc-2018-bevel
https://developer.blender.org/rB190d1b2f7ae04cbe244b581f78dfdeb3387c9ea0
Fixed merge errors
===================================================================
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/transform/transform.c
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_weighted_normal.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_tools.c
b/source/blender/editors/mesh/editmesh_tools.c
index f8c1db30276..9683bf43968 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -7049,7 +7049,7 @@ static void point_normals_free(bContext *C, wmOperator
*op)
BMLoopNorEditDataArray *lnors_ed_arr = op->customdata;
BM_loop_normal_editdata_array_free(lnors_ed_arr);
op->customdata = NULL;
- ED_area_headerprint(CTX_wm_area(C), NULL);
+ ED_area_status_text(CTX_wm_area(C), NULL);
}
static void point_normals_update_header(bContext *C, wmOperator *op)
@@ -7080,7 +7080,7 @@ static void point_normals_update_header(bContext *C,
wmOperator *op)
#undef WM_MODALKEY
- ED_area_headerprint(CTX_wm_area(C), header);
+ ED_area_status_text(CTX_wm_area(C), header);
}
/* TODO move that to generic function in BMesh? */
@@ -7226,7 +7226,7 @@ static int edbm_point_normals_modal(bContext *C,
wmOperator *op, const wmEvent *
case EDBM_CLNOR_MODAL_POINTTO_SET_USE_3DCURSOR:
new_mode = EDBM_CLNOR_POINTTO_MODE_COORDINATES;
- ED_view3d_cursor3d_update(C, event->mval);
+ ED_view3d_cursor3d_update(C, event->mval,
false, V3D_CURSOR_ORIENT_NONE);
copy_v3_v3(target,
ED_view3d_cursor3d_get(scene, v3d)->location);
break;
@@ -8263,4 +8263,4 @@ void MESH_OT_mod_weighted_strength(struct wmOperatorType
*ot)
ot->prop = RNA_def_boolean(ot->srna, "set", 0, "Set value", "Set Value
of faces");
RNA_def_property_flag(ot->prop, PROP_HIDDEN);
-}
\ No newline at end of file
+}
diff --git a/source/blender/editors/transform/transform.c
b/source/blender/editors/transform/transform.c
index ba9430c46f7..9a52127b201 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -4428,7 +4428,7 @@ static void applyNormalRotation(TransInfo *t, const int
UNUSED(mval[2]))
recalcData(t);
- ED_area_headerprint(t->sa, str);
+ ED_area_status_text(t->sa, str);
}
/** \} */
diff --git a/source/blender/modifiers/intern/MOD_bevel.c
b/source/blender/modifiers/intern/MOD_bevel.c
index aa12093b505..67634dba170 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -53,6 +53,8 @@
#include "bmesh.h"
#include "bmesh_tools.h"
+#include "DEG_depsgraph_query.h"
+
static void initData(ModifierData *md)
{
BevelModifierData *bmd = (BevelModifierData *) md;
@@ -289,6 +291,8 @@ static Mesh *applyModifier(ModifierData *md, const
ModifierEvalContext *ctx, Mes
const bool mark_sharp = (bmd->edge_flags & MOD_BEVEL_MARK_SHARP);
const bool set_wn_strength = (bmd->flags & MOD_BEVEL_SET_WN_STR);
+ struct Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
+
bm = BKE_mesh_to_bmesh_ex(
mesh,
&(struct BMeshCreateParams){0},
@@ -363,12 +367,12 @@ static Mesh *applyModifier(ModifierData *md, const
ModifierEvalContext *ctx, Mes
if (bmd->hnmode != MOD_BEVEL_HN_NONE) {
if (bmd->hnmode != BEVEL_HN_FIX_SHA)
bevel_mod_harden_normals(bmd, bm, bmd->hn_strength,
bmd->hnmode, dvert, vgroup);
- else
+ else if(bmd->clnordata.faceHash)
bevel_fix_normal_shading_continuity(bmd, bm);
}
if(set_wn_strength)
- bevel_set_weighted_normal_face_strength(bm, md->scene);
+ bevel_set_weighted_normal_face_strength(bm, scene);
result = BKE_bmesh_to_mesh_nomain(bm, &(struct BMeshToMeshParams){0});
@@ -377,7 +381,8 @@ static Mesh *applyModifier(ModifierData *md, const
ModifierEvalContext *ctx, Mes
bm->ftoolflagpool == NULL); /* make sure we never alloc'd
these */
BM_mesh_free(bm);
- BLI_ghash_free(bmd->clnordata.faceHash, NULL, NULL);
+ if(bmd->clnordata.faceHash)
+ BLI_ghash_free(bmd->clnordata.faceHash, NULL, NULL);
result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;
diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c
b/source/blender/modifiers/intern/MOD_weighted_normal.c
index b43ef698cc4..a2ace1aadc4 100644
--- a/source/blender/modifiers/intern/MOD_weighted_normal.c
+++ b/source/blender/modifiers/intern/MOD_weighted_normal.c
@@ -554,7 +554,7 @@ static Mesh *applyModifier(ModifierData *md, const
ModifierEvalContext *ctx, Mes
MDeformVert *dvert;
int defgrp_index;
- modifier_get_vgroup_mesh(ob, result, wnmd->defgrp_name, &dvert,
&defgrp_index);
+ MOD_get_vgroup(ctx->object, mesh, wnmd->defgrp_name, &dvert,
&defgrp_index);
WeightedNormalData wn_data = {
.numVerts = numVerts,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
