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:
Diffstat
-rw-r--r--source/blender/blenkernel/intern/bpath.c4
-rw-r--r--source/blender/blenkernel/intern/group.c5
-rw-r--r--source/blender/blenkernel/intern/object.c2
-rw-r--r--source/blender/blenkernel/intern/text.c2
-rw-r--r--source/blender/editors/animation/anim_channels_defines.c2
-rw-r--r--source/blender/editors/animation/anim_filter.c2
-rw-r--r--source/blender/editors/space_view3d/drawobject.c2
-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
12 files changed, 21 insertions, 19 deletions
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c
index 806b944572f..1dbb02df740 100644
--- a/source/blender/blenkernel/intern/bpath.c
+++ b/source/blender/blenkernel/intern/bpath.c
@@ -590,8 +590,8 @@ void BKE_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int
for (; module; module = module->next) {
rewrite_path_fixed(module->module_path, visit_cb, absbase, bpath_user_data);
}
- }
- }
+ }
+ }
#endif
break;
}
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index d0a9a6efe6b..b1d0e8df754 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -79,7 +79,6 @@ void BKE_group_unlink(Group *group)
Object *ob;
Scene *sce;
SceneRenderLayer *srl;
- FreestyleLineSet *lineset;
ParticleSystem *psys;
for (ma = bmain->mat.first; ma; ma = ma->id.next) {
@@ -104,9 +103,11 @@ void BKE_group_unlink(Group *group)
}
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;
}
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 3750eadb6db..a5f05053bfc 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -681,7 +681,7 @@ void BKE_object_unlink(Object *ob)
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)
{
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 4527d2a5056..842f495dffe 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -614,7 +614,7 @@ void BKE_text_unlink(Main *bmain, Text *text)
/* 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;
}
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 4b0a99889b3..bd580ab590f 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -2097,7 +2097,7 @@ static void *acf_dslinestyle_setting_ptr(bAnimListElem *ale, int setting, short
}
/* node tree expander type define */
-static bAnimChannelType ACF_DSLINESTYLE=
+static bAnimChannelType ACF_DSLINESTYLE =
{
"Line Style Expander", /* type name */
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index df840df05e7..2561d517a3c 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1577,7 +1577,7 @@ static size_t animdata_filter_ds_linestyle (bAnimContext *ac, ListBase *anim_dat
/* 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);
}
}
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index cd68fbf126e..4727502062d 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3116,7 +3116,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
draw_dm_edges_freestyle(em, cageDM);
- glColor3ub(0,0,0);
+ glColor3ub(0, 0, 0);
glLineWidth(1);
}
#endif
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 00:19:46 +0300