[Bf-blender-cvs] [6c6c3bad02d] blender2.8: Cleanup: style

Campbell Barton noreply at git.blender.org
Tue Sep 11 21:47:23 CEST 2018


Commit: 6c6c3bad02d0f6f9c3deee40f403bb4f48ff7f26
Author: Campbell Barton
Date:   Wed Sep 12 05:57:18 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB6c6c3bad02d0f6f9c3deee40f403bb4f48ff7f26

Cleanup: style

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

M	source/blender/blenkernel/intern/subdiv_ccg.c
M	source/blender/draw/engines/eevee/eevee_temporal_sampling.c
M	source/blender/editors/sculpt_paint/paint_image_proj.c

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

diff --git a/source/blender/blenkernel/intern/subdiv_ccg.c b/source/blender/blenkernel/intern/subdiv_ccg.c
index 33785c09936..9f44ce0d090 100644
--- a/source/blender/blenkernel/intern/subdiv_ccg.c
+++ b/source/blender/blenkernel/intern/subdiv_ccg.c
@@ -180,9 +180,10 @@ static void subdiv_ccg_eval_grid_element(
 	}
 }
 
-BLI_INLINE void rotate_corner_to_quad(const int corner,
-	                                  const float u, const float v,
-                                      float *r_u, float *r_v)
+BLI_INLINE void rotate_corner_to_quad(
+        const int corner,
+        const float u, const float v,
+        float *r_u, float *r_v)
 {
 	if (corner == 0) {
 		*r_u = 0.5f - v * 0.5f;
@@ -281,9 +282,10 @@ static void subdiv_ccg_eval_grids_task(
 	}
 }
 
-static bool subdiv_ccg_evaluate_grids(SubdivCCG *subdiv_ccg,
-	                                  Subdiv *subdiv,
-                                      const Mesh *coarse_mesh)
+static bool subdiv_ccg_evaluate_grids(
+        SubdivCCG *subdiv_ccg,
+        Subdiv *subdiv,
+        const Mesh *coarse_mesh)
 {
 	/* Make sure evaluator is ready. */
 	if (!BKE_subdiv_eval_update_from_mesh(subdiv, coarse_mesh)) {
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index 384fb28a776..6216b28329b 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -350,8 +350,8 @@ void EEVEE_temporal_sampling_draw(EEVEE_Data *vedata)
 
 			/* Do reprojection for noise reduction */
 			/* TODO : do AA jitter if in only render view. */
-			if (!DRW_state_is_image_render() && 
-				(effects->enabled_effects & EFFECT_TAA_REPROJECT) != 0 &&
+			if (!DRW_state_is_image_render() &&
+			    (effects->enabled_effects & EFFECT_TAA_REPROJECT) != 0 &&
 			    stl->g_data->valid_taa_history)
 			{
 				GPU_framebuffer_bind(effects->target_buffer);
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 386ae315b93..43ca0382bf1 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -5744,7 +5744,7 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op)
 
 			if (type > LAYER_BASE_COLOR) {
 				/* This is a "non color data" image */
-				NodeTexImage* tex = imanode->storage;
+				NodeTexImage *tex = imanode->storage;
 				tex->color_space = SHD_COLORSPACE_NONE;
 			}



More information about the Bf-blender-cvs mailing list