[Bf-blender-cvs] [00a3d99f934] master: Cleanup: format, unused var

Campbell Barton noreply at git.blender.org
Wed Feb 26 05:26:28 CET 2020


Commit: 00a3d99f9342a2c22f7407776c6fa870bca3dbb0
Author: Campbell Barton
Date:   Wed Feb 26 14:21:57 2020 +1100
Branches: master
https://developer.blender.org/rB00a3d99f9342a2c22f7407776c6fa870bca3dbb0

Cleanup: format, unused var

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

M	source/blender/blenkernel/intern/pbvh.c
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 3be3adf0e8f..efe13fc8817 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1428,12 +1428,10 @@ static void pbvh_grids_node_visibility_update(PBVH *bvh, PBVHNode *node)
   BKE_pbvh_node_fully_hidden_set(node, true);
 }
 
-static void pbvh_bmesh_node_visibility_update(PBVH *bvh, PBVHNode *node)
+static void pbvh_bmesh_node_visibility_update(PBVHNode *node)
 {
-  BMesh *bm;
   GSet *unique, *other;
 
-  bm = BKE_pbvh_get_bmesh(bvh);
   unique = BKE_pbvh_bmesh_node_unique_verts(node);
   other = BKE_pbvh_bmesh_node_other_verts(node);
 
@@ -1475,7 +1473,7 @@ static void pbvh_update_visibility_task_cb(void *__restrict userdata,
         pbvh_grids_node_visibility_update(bvh, node);
         break;
       case PBVH_BMESH:
-        pbvh_bmesh_node_visibility_update(bvh, node);
+        pbvh_bmesh_node_visibility_update(node);
         break;
     }
     node->flag &= ~PBVH_UpdateMask;
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 34f4fd45b9c..3e223d613b8 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -3094,7 +3094,6 @@ static void rna_def_userdef_theme_space_seq(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Marker Line Selected", "");
   RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
 
-
   prop = RNA_def_property(srna, "keyframe", PROP_FLOAT, PROP_COLOR_GAMMA);
   RNA_def_property_float_sdna(prop, NULL, "vertex_select");
   RNA_def_property_array(prop, 3);
@@ -3173,7 +3172,6 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Marker Line Selected", "");
   RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
 
-
   prop = RNA_def_property(srna, "value_sliders", PROP_FLOAT, PROP_COLOR_GAMMA);
   RNA_def_property_float_sdna(prop, NULL, "face");
   RNA_def_property_array(prop, 3);
@@ -3493,7 +3491,6 @@ static void rna_def_userdef_theme_space_nla(BlenderRNA *brna)
   RNA_def_property_array(prop, 4);
   RNA_def_property_ui_text(prop, "Marker Line Selected", "");
   RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
-
 }
 
 static void rna_def_userdef_theme_colorset(BlenderRNA *brna)
@@ -3624,7 +3621,6 @@ static void rna_def_userdef_theme_space_clip(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Marker Line Selected", "");
   RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
 
-
   prop = RNA_def_property(srna, "strips", PROP_FLOAT, PROP_COLOR_GAMMA);
   RNA_def_property_float_sdna(prop, NULL, "strip");
   RNA_def_property_array(prop, 3);



More information about the Bf-blender-cvs mailing list