[Bf-blender-cvs] [5c08d174235] blender2.8: Draw manager: Fix missing active camera triangle with CoW
Sergey Sharybin
noreply at git.blender.org
Wed Mar 21 16:31:15 CET 2018
Commit: 5c08d17423516540dc8be27396bee4529d6c879b
Author: Sergey Sharybin
Date: Wed Mar 21 16:29:35 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB5c08d17423516540dc8be27396bee4529d6c879b
Draw manager: Fix missing active camera triangle with CoW
===================================================================
M source/blender/draw/modes/object_mode.c
===================================================================
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index ded2bc68062..ccdac1f8687 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1304,7 +1304,8 @@ static void DRW_shgroup_camera(OBJECT_StorageList *stl, Object *ob, ViewLayer *v
RegionView3D *rv3d = draw_ctx->rv3d;
Camera *cam = ob->data;
- const bool is_active = (ob == v3d->camera);
+ const Object *camera_object = DEG_get_evaluated_object(draw_ctx->depsgraph, v3d->camera);
+ const bool is_active = (ob == camera_object);
const bool look_through = (is_active && (rv3d->persp == RV3D_CAMOB));
float *color;
DRW_object_wire_theme_get(ob, view_layer, &color);
More information about the Bf-blender-cvs
mailing list