[Bf-blender-cvs] [22787636816] master: Multires: Don't force smooth shading

Sergey Sharybin noreply at git.blender.org
Fri Feb 22 14:47:07 CET 2019


Commit: 22787636816a8661b7c4974216f3ea5af7cda2b0
Author: Sergey Sharybin
Date:   Fri Feb 22 14:45:32 2019 +0100
Branches: master
https://developer.blender.org/rB22787636816a8661b7c4974216f3ea5af7cda2b0

Multires: Don't force smooth shading

There is still work needed to be done from multires side to fully
support smooth shading. So can't just always have smooth shading.

Roll back to a proper code in GPU side, the rest will be handled
from CCG side.

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

M	source/blender/gpu/intern/gpu_buffers.c

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

diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 85459c4de40..242882b011a 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -504,7 +504,7 @@ void GPU_pbvh_grid_buffers_update(
 	bool empty_mask = true;
 	int i, j, k, x, y;
 
-	const bool smooth = true;//grid_flag_mats[grid_indices[0]].flag & ME_SMOOTH;
+	const bool smooth = grid_flag_mats[grid_indices[0]].flag & ME_SMOOTH;
 
 	/* Build VBO */
 	const int has_mask = key->has_mask;



More information about the Bf-blender-cvs mailing list