Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-04-05 20:55:12 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-04-05 20:55:12 +0400
commit002dbaece721beaacf7da149309214f2dc9111af (patch)
treeb69cf7d8912aa147a60e81f7f4caa3e3f36df11f /source/blender/makesrna
parentfabbc5b1fa8d09e5f0b964d45b5f53caa9548c0b (diff)
style cleanup
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_color.c2
-rw-r--r--source/blender/makesrna/intern/rna_linestyle.c2
-rw-r--r--source/blender/makesrna/intern/rna_main.c2
-rw-r--r--source/blender/makesrna/intern/rna_main_api.c7
-rw-r--r--source/blender/makesrna/intern/rna_scene.c8
5 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index 640e91adabf..46420b38224 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -336,7 +336,7 @@ static void rna_ColorRamp_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *
break;
case ID_LS:
{
- FreestyleLineStyle *linestyle= ptr->id.data;
+ FreestyleLineStyle *linestyle = ptr->id.data;
WM_main_add_notifier(NC_LINESTYLE, linestyle);
break;
diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c
index a1225acb305..84c6827a8f6 100644
--- a/source/blender/makesrna/intern/rna_linestyle.c
+++ b/source/blender/makesrna/intern/rna_linestyle.c
@@ -504,7 +504,7 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna)
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);
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c
index 389ec426428..6a43fed3ac6 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -261,7 +261,7 @@ static void rna_Main_masks_begin(CollectionPropertyIterator *iter, PointerRNA *p
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);
}
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index ba45e10ae08..a2f9b554d3f 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -846,7 +846,7 @@ static void rna_Main_grease_pencil_remove(Main *bmain, ReportList *reports, Poin
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 @@ FreestyleLineStyle *rna_Main_linestyles_new(Main *bmain, const char* name)
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? */
}
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 5cdd0a3935c..1843f44d1a1 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1465,7 +1465,7 @@ static PointerRNA rna_FreestyleLineSet_linestyle_get(PointerRNA *ptr)
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 @@ static void rna_def_freestyle_settings(BlenderRNA *brna)
{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 @@ static void rna_def_freestyle_settings(BlenderRNA *brna)
*/
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 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
{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);