[Bf-blender-cvs] [3a07b2124bb] blender2.8: Fix T55877: Crash snapping non-edit-mesh to grid
Campbell Barton
noreply at git.blender.org
Tue Jul 10 08:25:22 CEST 2018
Commit: 3a07b2124bb2c43b856ae53c7d97d5d86867077e
Author: Campbell Barton
Date: Tue Jul 10 08:24:05 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3a07b2124bb2c43b856ae53c7d97d5d86867077e
Fix T55877: Crash snapping non-edit-mesh to grid
===================================================================
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/space_view3d/view3d_snap.c
===================================================================
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 6110d5f3466..b56904b4caa 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -390,14 +390,12 @@ static uiBlock *id_search_menu(bContext *C, ARegion *ar, void *arg_litem)
/* for new/open operators */
void UI_context_active_but_prop_get_templateID(
- bContext *C,
- PointerRNA *r_ptr, PropertyRNA **r_prop)
+ bContext *C,
+ PointerRNA *r_ptr, PropertyRNA **r_prop)
{
TemplateID *template_ui;
uiBut *but = UI_context_active_but_get(C);
- memset(r_ptr, 0, sizeof(*r_ptr));
- *r_prop = NULL;
if (but && but->func_argN) {
template_ui = but->func_argN;
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index 606c07cd1fa..11575f8b1f3 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -92,15 +92,6 @@ static int snap_sel_to_grid_exec(bContext *C, wmOperator *UNUSED(op))
Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
obedit = objects[ob_index];
- BMEditMesh *em = BKE_editmesh_from_object(obedit);
-
- if ((em->bm->totvertsel == 0) &&
- (em->bm->totedgesel == 0) &&
- (em->bm->totfacesel == 0))
- {
- continue;
- }
-
if (ED_transverts_check_obedit(obedit)) {
ED_transverts_create_from_obedit(&tvs, obedit, 0);
}
More information about the Bf-blender-cvs
mailing list