Commit: 535277144a92c179d0d2731fb0a5576be267f97e
Author: Antonio Vazquez
Date: Tue Feb 13 17:51:26 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB535277144a92c179d0d2731fb0a5576be267f97e
Fix merge compiler error
===================================================================
M source/blender/editors/space_view3d/view3d_draw_legacy.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c
b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index 0e70a589ae0..82b8bfa23a6 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -1672,7 +1672,7 @@ static void view3d_draw_objects(
draw_dupli_objects(eval_ctx, scene,
view_layer, ar, v3d, base);
}
if ((base->flag & BASE_SELECTED) == 0) {
- if (base->object != obedit)
+ if (base->object != obedit) {
draw_object(eval_ctx, scene,
view_layer, ar, v3d, base, 0);
/* draw grease pencil */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
