Revision: 55820
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55820
Author: campbellbarton
Date: 2013-04-05 16:55:12 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c
2013-04-05 16:53:24 UTC (rev 55819)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -590,8 +590,8 @@
for (; module; module = module->next) {
rewrite_path_fixed(module->module_path, visit_cb, absbase, bpath_user_data);
}
- }
- }
+ }
+ }
#endif
break;
}
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
2013-04-05 16:53:24 UTC (rev 55819)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -79,7 +79,6 @@
Object *ob;
Scene *sce;
SceneRenderLayer *srl;
- FreestyleLineSet *lineset;
ParticleSystem *psys;
for (ma = bmain->mat.first; ma; ma = ma->id.next) {
@@ -104,9 +103,11 @@
}
for (srl = sce->r.layers.first; srl; srl = srl->next) {
+ FreestyleLineSet *lineset;
+
if (srl->light_override == group)
srl->light_override = NULL;
- for(lineset = srl->freestyleConfig.linesets.first;
lineset; lineset= lineset->next) {
+ for (lineset = srl->freestyleConfig.linesets.first;
lineset; lineset = lineset->next) {
if (lineset->group == group)
lineset->group = NULL;
}
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
2013-04-05 16:53:24 UTC (rev 55819)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -681,7 +681,7 @@
SEQ_END
}
- for (srl= sce->r.layers.first; srl; srl= srl->next) {
+ for (srl = sce->r.layers.first; srl; srl = srl->next) {
for (lineset = (FreestyleLineSet
*)srl->freestyleConfig.linesets.first;
lineset; lineset = lineset->next)
{
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
2013-04-05 16:53:24 UTC (rev 55819)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -614,7 +614,7 @@
/* Freestyle */
for (sce = bmain->scene.first; sce; sce = sce->id.next) {
for (srl = sce->r.layers.first; srl; srl = srl->next) {
- for (module = srl->freestyleConfig.modules.first;
module; module= module->next) {
+ for (module = srl->freestyleConfig.modules.first;
module; module = module->next) {
if (module->script == text)
module->script = NULL;
}
Modified:
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
2013-04-05 16:53:24 UTC (rev 55819)
+++
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -2097,7 +2097,7 @@
}
/* node tree expander type define */
-static bAnimChannelType ACF_DSLINESTYLE=
+static bAnimChannelType ACF_DSLINESTYLE =
{
"Line Style Expander", /* type name */
Modified:
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
2013-04-05 16:53:24 UTC (rev 55819)
+++ branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -1577,7 +1577,7 @@
/* include anim-expand widget first */
if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
/* check if filtering by active status
*/
- if ANIMCHANNEL_ACTIVEOK(linestyle) {
+ if (ANIMCHANNEL_ACTIVEOK(linestyle)) {
ANIMCHANNEL_NEW_CHANNEL(linestyle, ANIMTYPE_DSLINESTYLE, sce);
}
}
Modified:
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
2013-04-05 16:53:24 UTC (rev 55819)
+++
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -3116,7 +3116,7 @@
draw_dm_edges_freestyle(em, cageDM);
- glColor3ub(0,0,0);
+ glColor3ub(0, 0, 0);
glLineWidth(1);
}
#endif
Modified: branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
2013-04-05 16:53:24 UTC (rev 55819)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -336,7 +336,7 @@
break;
case ID_LS:
{
- FreestyleLineStyle *linestyle= ptr->id.data;
+ FreestyleLineStyle *linestyle = ptr->id.data;
WM_main_add_notifier(NC_LINESTYLE, linestyle);
break;
Modified:
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c
2013-04-05 16:53:24 UTC (rev 55819)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -504,7 +504,7 @@
rna_def_alpha_modifier(srna);
rna_def_modifier_curve_common(srna, TRUE, FALSE);
- srna= RNA_def_struct(brna, "LineStyleAlphaModifier_DistanceFromObject",
"LineStyleAlphaModifier");
+ srna = RNA_def_struct(brna,
"LineStyleAlphaModifier_DistanceFromObject", "LineStyleAlphaModifier");
RNA_def_struct_ui_text(srna, "Distance from Object",
"Change alpha transparency based on the distance
from an object");
rna_def_alpha_modifier(srna);
Modified: branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
2013-04-05 16:53:24 UTC (rev 55819)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -261,7 +261,7 @@
static void rna_Main_linestyle_begin(CollectionPropertyIterator *iter,
PointerRNA *ptr)
{
- Main *bmain = (Main*)ptr->data;
+ Main *bmain = (Main *)ptr->data;
rna_iterator_listbase_begin(iter, &bmain->linestyle, NULL);
}
Modified:
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
2013-04-05 16:53:24 UTC (rev 55819)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -846,7 +846,7 @@
gpd->id.name + 2, ID_REAL_USERS(gpd));
}
-FreestyleLineStyle *rna_Main_linestyles_new(Main *bmain, const char* name)
+FreestyleLineStyle *rna_Main_linestyles_new(Main *bmain, const char *name)
{
FreestyleLineStyle *linestyle = BKE_new_linestyle(name, bmain);
id_us_min(&linestyle->id);
@@ -855,10 +855,11 @@
void rna_Main_linestyles_remove(Main *bmain, ReportList *reports,
FreestyleLineStyle *linestyle)
{
- if(ID_REAL_USERS(linestyle) <= 0)
+ if (ID_REAL_USERS(linestyle) <= 0)
BKE_libblock_free(&bmain->linestyle, linestyle);
else
- BKE_reportf(reports, RPT_ERROR, "Line style '%s' must have zero
users to be removed, found %d", linestyle->id.name+2, ID_REAL_USERS(linestyle));
+ BKE_reportf(reports, RPT_ERROR, "Line style '%s' must have zero
users to be removed, found %d",
+ linestyle->id.name + 2, ID_REAL_USERS(linestyle));
/* XXX python now has invalid pointer? */
}
Modified: branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
2013-04-05 16:53:24 UTC (rev 55819)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
2013-04-05 16:55:12 UTC (rev 55820)
@@ -1465,7 +1465,7 @@
static void rna_FreestyleLineSet_linestyle_set(PointerRNA *ptr, PointerRNA
value)
{
- FreestyleLineSet *lineset = (FreestyleLineSet*)ptr->data;
+ FreestyleLineSet *lineset = (FreestyleLineSet *)ptr->data;
lineset->linestyle->id.us--;
lineset->linestyle = (FreestyleLineStyle *)value.data;
@@ -2434,7 +2434,7 @@
{0, NULL, 0, NULL, NULL}
};
- static EnumPropertyItem visibility_items[] ={
+ static EnumPropertyItem visibility_items[] = {
{FREESTYLE_QI_VISIBLE, "VISIBLE", 0, "Visible", "Select visible
feature edges"},
{FREESTYLE_QI_HIDDEN, "HIDDEN", 0, "Hidden", "Select hidden
feature edges"},
{FREESTYLE_QI_RANGE, "RANGE", 0, "QI Range",
@@ -2473,7 +2473,7 @@
*/
prop = RNA_def_property(srna, "linestyle", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "FreestyleLineStyle");
- RNA_def_property_flag(prop, PROP_EDITABLE|PROP_NEVER_NULL);
+ RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL);
RNA_def_property_pointer_funcs(prop,
"rna_FreestyleLineSet_linestyle_get",
"rna_FreestyleLineSet_linestyle_set",
NULL, NULL);
RNA_def_property_ui_text(prop, "Line Style", "Line style settings");
@@ -3927,7 +3927,7 @@
{R_LINE_THICKNESS_ABSOLUTE, "ABSOLUTE", 0, "Absolute", "Specify
unit line thickness in pixels"},
{R_LINE_THICKNESS_RELATIVE, "RELATIVE", 0, "Relative",
"Unit line thickness is scaled by
the proportion of the present vertical image "
- "resolution to 480 pixels"},
+ "resolution to 480 pixels"},
{0, NULL, 0, NULL, NULL}};
rna_def_scene_ffmpeg_settings(brna);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
