archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: format, unused var

Browse Source
This commit is contained in:
Campbell Barton
2020-02-26 14:21:57 +11:00
parent dc257318d0
commit 00a3d99f93
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/pbvh.c
View File

@@ -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;

4
source/blender/makesrna/intern/rna_userdef.c
View File

@@ -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);