[Bf-blender-cvs] [e6f8f189023] master: Cleanup: clang-format

Campbell Barton noreply at git.blender.org
Wed Aug 21 20:41:41 CEST 2019


Commit: e6f8f189023d1472f77797789e0c2bea78716df6
Author: Campbell Barton
Date:   Thu Aug 22 04:36:04 2019 +1000
Branches: master
https://developer.blender.org/rBe6f8f189023d1472f77797789e0c2bea78716df6

Cleanup: clang-format

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

M	source/blender/editors/armature/armature_utils.c
M	source/blender/gpu/shaders/gpu_shader_material.glsl

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

diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c
index 63b55a3f1b8..cd299906b4c 100644
--- a/source/blender/editors/armature/armature_utils.c
+++ b/source/blender/editors/armature/armature_utils.c
@@ -381,8 +381,12 @@ void armature_tag_unselect(bArmature *arm)
 
 void ED_armature_ebone_transform_mirror_update(bArmature *arm, EditBone *ebo, bool check_select)
 {
-  /* TODO When this function is called by property updates, cancelling the value change will not restore mirrored bone correctly. */
-  /* Currently check_select==true when this function is called from a transform operator, eg. from 3d viewport. */
+  /* TODO When this function is called by property updates,
+   * cancelling the value change will not restore mirrored bone correctly. */
+
+  /* Currently check_select==true when this function is called from a transform operator,
+   * eg. from 3d viewport. */
+
   /* no layer check, correct mirror is more important */
   if (!check_select || ebo->flag & (BONE_TIPSEL | BONE_ROOTSEL)) {
     EditBone *eboflip = ED_armature_ebone_get_mirrored(arm->edbo, ebo);
@@ -440,7 +444,8 @@ void ED_armature_ebone_transform_mirror_update(bArmature *arm, EditBone *ebo, bo
 
       if (!check_select || ebo->flag & BONE_SELECTED) {
         /* Mirror bone body properties (both head and tail are selected). */
-        /* TODO: These values can also be changed from pose mode, so only mirroring them in edit mode is not ideal. */
+        /* TODO: These values can also be changed from pose mode,
+         * so only mirroring them in edit mode is not ideal. */
         eboflip->dist = ebo->dist;
         eboflip->weight = ebo->weight;
 
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 5ec24ec7086..acd28789364 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -400,7 +400,8 @@ void map_range(
   }
 }
 
-vec3 safe_divide(vec3 a, vec3 b) {
+vec3 safe_divide(vec3 a, vec3 b)
+{
   return vec3((b.x != 0.0) ? a.x / b.x : 0.0,
               (b.y != 0.0) ? a.y / b.y : 0.0,
               (b.z != 0.0) ? a.z / b.z : 0.0);



More information about the Bf-blender-cvs mailing list