[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53453] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Mon Dec 31 03:37:35 CET 2012
Revision: 53453
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53453
Author: campbellbarton
Date: 2012-12-31 02:37:28 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_pbvh.h
trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_log.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_info/info_stats.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
Modified: trunk/blender/source/blender/blenkernel/BKE_pbvh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_pbvh.h 2012-12-31 01:12:29 UTC (rev 53452)
+++ trunk/blender/source/blender/blenkernel/BKE_pbvh.h 2012-12-31 02:37:28 UTC (rev 53453)
@@ -69,7 +69,7 @@
struct CCGKey *key, void **gridfaces, struct DMFlagMat *flagmats,
unsigned int **grid_hidden);
void BKE_pbvh_build_bmesh(PBVH *bvh, struct BMesh *bm, int smooth_shading,
- struct BMLog *log);
+ struct BMLog *log);
void BKE_pbvh_free(PBVH *bvh);
Modified: trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2012-12-31 01:12:29 UTC (rev 53452)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2012-12-31 02:37:28 UTC (rev 53453)
@@ -252,7 +252,7 @@
pbvh_bmesh_node_split(bvh, prim_bbc, node_index);
- BLI_ghash_free(prim_bbc, NULL, (void*)MEM_freeN);
+ BLI_ghash_free(prim_bbc, NULL, (void *)MEM_freeN);
return TRUE;
}
@@ -909,9 +909,11 @@
/* Check that the vertices/edge still exist */
if (BLI_ghash_haskey(deleted_verts, v1) ||
- BLI_ghash_haskey(deleted_verts, v2) ||
- !(e = BM_edge_exists(v1, v2)))
+ BLI_ghash_haskey(deleted_verts, v2) ||
+ !(e = BM_edge_exists(v1, v2)))
+ {
continue;
+ }
/* Check that the edge's vertices are still in the PBVH. It's
* possible that an edge collapse has deleted adjacent faces
@@ -1153,7 +1155,7 @@
void BKE_pbvh_bmesh_detail_size_set(PBVH *bvh, float detail_size)
{
bvh->bm_max_edge_len = detail_size;
- bvh->bm_min_edge_len = bvh->bm_max_edge_len * 0.4;
+ bvh->bm_min_edge_len = bvh->bm_max_edge_len * 0.4f;
}
void BKE_pbvh_node_mark_topology_update(PBVHNode *node)
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_log.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_log.c 2012-12-31 01:12:29 UTC (rev 53452)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_log.c 2012-12-31 02:37:28 UTC (rev 53453)
@@ -540,7 +540,7 @@
const unsigned id = bm_log_vert_id_get(log, v);
const void *key = SET_INT_IN_POINTER(id);
const void *val = BLI_ghash_lookup(id_to_idx, key);
- ((int*)varr)[i++] = GET_INT_FROM_POINTER(val);
+ ((int *)varr)[i++] = GET_INT_FROM_POINTER(val);
}
BLI_ghash_free(id_to_idx, NULL, NULL);
@@ -551,7 +551,7 @@
const unsigned id = bm_log_face_id_get(log, f);
const void *key = SET_INT_IN_POINTER(id);
const void *val = BLI_ghash_lookup(id_to_idx, key);
- ((int*)farr)[i++] = GET_INT_FROM_POINTER(val);
+ ((int *)farr)[i++] = GET_INT_FROM_POINTER(val);
}
BLI_ghash_free(id_to_idx, NULL, NULL);
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2012-12-31 01:12:29 UTC (rev 53452)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2012-12-31 02:37:28 UTC (rev 53453)
@@ -2966,7 +2966,7 @@
data.ss = ss;
data.sd = sd;
- radius = ss->cache->radius * 1.25;
+ radius = ss->cache->radius * 1.25f;
data.radius_squared = radius * radius;
data.original = ELEM4(brush->sculpt_tool,
Modified: trunk/blender/source/blender/editors/space_info/info_stats.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_stats.c 2012-12-31 01:12:29 UTC (rev 53452)
+++ trunk/blender/source/blender/editors/space_info/info_stats.c 2012-12-31 02:37:28 UTC (rev 53453)
@@ -315,7 +315,7 @@
static int stats_is_object_dynamic_topology_sculpt(Object *ob)
{
return (ob && (ob->mode & OB_MODE_SCULPT) &&
- ob->sculpt && ob->sculpt->bm);
+ ob->sculpt && ob->sculpt->bm);
}
/* Statistics displayed in info header. Called regularly on scene changes. */
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2012-12-31 01:12:29 UTC (rev 53452)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2012-12-31 02:37:28 UTC (rev 53453)
@@ -1487,11 +1487,11 @@
SCULPT_SHOW_DIFFUSE = (1<<9),
/* If set, the mesh will be drawn with smooth-shading in
- dynamic-topology mode */
+ * dynamic-topology mode */
SCULPT_DYNTOPO_SMOOTH_SHADING = (1<<10),
/* If set, dynamic-topology brushes will collapse short edges in
- addition to subdividing long ones */
+ * addition to subdividing long ones */
SCULPT_DYNTOPO_COLLAPSE = (1<<11)
} SculptFlags;
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2012-12-31 01:12:29 UTC (rev 53452)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2012-12-31 02:37:28 UTC (rev 53453)
@@ -1439,7 +1439,7 @@
int rna_Object_use_dynamic_topology_sculpting_get(PointerRNA *ptr)
{
- SculptSession *ss = ((Object*)ptr->id.data)->sculpt;
+ SculptSession *ss = ((Object *)ptr->id.data)->sculpt;
return (ss && ss->bm);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c 2012-12-31 01:12:29 UTC (rev 53452)
+++ trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c 2012-12-31 02:37:28 UTC (rev 53453)
@@ -347,15 +347,15 @@
prop = RNA_def_property(srna, "use_smooth_shading", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_DYNTOPO_SMOOTH_SHADING);
RNA_def_property_ui_text(prop, "Smooth Shading",
- "Show faces in dynamic-topology mode with smooth "
- "shading rather than flat shaded");
+ "Show faces in dynamic-topology mode with smooth "
+ "shading rather than flat shaded");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Sculpt_update");
prop = RNA_def_property(srna, "use_edge_collapse", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_DYNTOPO_COLLAPSE);
RNA_def_property_ui_text(prop, "Collapse Short Edges",
- "In dynamic-topology mode, collapse short edges "
- "in addition to subdividing long ones");
+ "In dynamic-topology mode, collapse short edges "
+ "in addition to subdividing long ones");
prop = RNA_def_property(srna, "symmetrize_direction", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, symmetrize_direction_items);
More information about the Bf-blender-cvs
mailing list