[Bf-blender-cvs] [26b6bd6e900] blender2.8: Object Mode Engine: Fix grid distance if view is camera view.

Clément Foucault noreply at git.blender.org
Wed May 10 01:12:05 CEST 2017


Commit: 26b6bd6e900a212106a5c84dddebb544f60733d2
Author: Clément Foucault
Date:   Tue May 9 21:50:18 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB26b6bd6e900a212106a5c84dddebb544f60733d2

Object Mode Engine: Fix grid distance if view is camera view.

===================================================================

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 72221d0820f..a31b0d12b98 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -378,7 +378,10 @@ static void OBJECT_engine_init(void *vedata)
 		winmat[3][2] -= offs;
 		mul_m4_m4m4(e_data.grid_mat, winmat, viewmat);
 
-		e_data.grid_settings[0] = v3d->far / 2.0f; /* gridDistance */
+		float dist = (rv3d->persp == RV3D_CAMOB && v3d->camera)
+		             ? ((Camera *)v3d->camera)->clipend : v3d->far;
+
+		e_data.grid_settings[0] = dist / 2.0f; /* gridDistance */
 		e_data.grid_settings[1] = grid_res; /* gridResolution */
 		e_data.grid_settings[2] = grid_scale; /* gridScale */
 		e_data.grid_settings[3] = v3d->gridsubdiv; /* gridSubdiv */




More information about the Bf-blender-cvs mailing list