Commit: 09924fcdd1e579711110227def5b9f1482586ac8
Author: Antonio Vazquez
Date: Wed May 23 19:35:33 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB09924fcdd1e579711110227def5b9f1482586ac8
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/editors/space_view3d/view3d_edit.c
index 26239fc674d,6db200c1262..c9fce539f34
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -2805,10 -2805,10 +2805,10 @@@ static int viewselected_exec(bContext *
Depsgraph *depsgraph = CTX_data_depsgraph(C);
ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph);
bGPdata *gpd = CTX_data_gpencil_data(C);
- const bool is_gp_edit = ((gpd) && (gpd->flag &
GP_DATA_STROKE_EDITMODE));
+ const bool is_gp_edit = GPENCIL_ANY_MODE(gpd);
const bool is_face_map = ((is_gp_edit == false) && ar->manipulator_map
&&
WM_manipulatormap_is_any_selected(ar->manipulator_map));
- Object *ob_eval = OBACT(view_layer_eval);
+ Object *ob_eval = DEG_get_evaluated_object(depsgraph,
OBACT(view_layer_eval));
Object *obedit = CTX_data_edit_object(C);
float min[3], max[3];
bool ok = false, ok_dist = true;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
