Cleanup: clang-format
authorCampbell Barton <ideasman42@gmail.com>
Fri, 26 Apr 2019 03:03:38 +0000 (13:03 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 26 Apr 2019 03:04:23 +0000 (13:04 +1000)
extern/draco/dracoenc/cmake/util.cmake
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl
source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
source/blender/draw/intern/draw_cache_impl_mesh.c
source/blender/draw/intern/draw_cache_impl_metaball.c
source/blender/draw/modes/edit_mesh_mode.c

index 252761f..d9254c0 100644 (file)
@@ -71,4 +71,3 @@ macro (set_variable_if_unset var_name default_value)
 endmacro ()
 
 endif()  # DRACO_CMAKE_UTIL_CMAKE_
-
index 38ecc95..4704306 100644 (file)
@@ -1027,8 +1027,8 @@ DynamicPaintSurface *dynamicPaint_createNewSurface(DynamicPaintCanvasSettings *c
 
   /* Set initial values */
   surface->flags = MOD_DPAINT_ANTIALIAS | MOD_DPAINT_MULALPHA | MOD_DPAINT_DRY_LOG |
-                   MOD_DPAINT_DISSOLVE_LOG | MOD_DPAINT_ACTIVE |
-                   MOD_DPAINT_OUT1 | MOD_DPAINT_USE_DRYING;
+                   MOD_DPAINT_DISSOLVE_LOG | MOD_DPAINT_ACTIVE | MOD_DPAINT_OUT1 |
+                   MOD_DPAINT_USE_DRYING;
   surface->effect = 0;
   surface->effect_ui = 1;
 
index 7054717..cc47e12 100644 (file)
@@ -62,7 +62,7 @@ void main()
     box = check_box_point(centered, vec2(gradient_s / 2.0));
     if ((box.x > 1.0) || (box.y > 1.0)) {
       discard;
-         }
+    }
   }
 
   vec4 tmp_color = texture2D(myTexture, mTexCoord);
index 3110f97..6b7cee8 100644 (file)
@@ -79,7 +79,7 @@ void main()
     float d = abs(mTexCoord.y - 0.5)  * (1.1 - gradient_f);
     float alpha = 1.0 - clamp((fragColor.a - (d * 2.0)), 0.03, 1.0);
     fragColor.a = smoothstep(fragColor.a, 0.0, alpha);
-    
+
   }
   */
 
index b2e960f..e52868f 100644 (file)
@@ -3386,8 +3386,7 @@ static void mesh_create_edit_facedots(MeshRenderData *rdata, GPUVertBuf *vbo_fac
   }
 }
 
-static void mesh_create_edit_mesh_analysis(MeshRenderData *rdata,
-                                                GPUVertBuf *vbo_mesh_analysis)
+static void mesh_create_edit_mesh_analysis(MeshRenderData *rdata, GPUVertBuf *vbo_mesh_analysis)
 {
   const MeshStatVis *mesh_stat_vis = &rdata->toolsettings->statvis;
 
index 2c06d53..432c509 100644 (file)
@@ -265,4 +265,4 @@ struct GPUBatch *DRW_metaball_batch_cache_get_edge_detection(struct Object *ob,
   }
 
   return cache->edge_detection;
-}
\ No newline at end of file
+}
index a83926f..6f7b30e 100644 (file)
@@ -696,7 +696,7 @@ static void EDIT_MESH_cache_populate(void *vedata, Object *ob)
       if (do_show_mesh_analysis) {
         Mesh *me = (Mesh *)ob->data;
         BMEditMesh *embm = me->edit_mesh;
-        const bool is_original = embm->mesh_eval_final && \
+        const bool is_original = embm->mesh_eval_final &&
                                  (embm->mesh_eval_final->runtime.is_original == true);
         if (is_original) {
           geom = DRW_cache_mesh_surface_mesh_analysis_get(ob);