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>2019-04-17 09:24:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 09:24:14 +0300
commit41d4a1986548e66a652221e4a68c52900474eeff (patch)
tree26acf937ea0b762977f89adcc4e74a3ec9ecee62 /source/blender/makesrna/intern
parent108045faa01849115c54190ebed788faf36dcb56 (diff)
ClangFormat: format '#if 0' code in source/
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r--source/blender/makesrna/intern/makesrna.c51
-rw-r--r--source/blender/makesrna/intern/rna_boid.c26
-rw-r--r--source/blender/makesrna/intern/rna_wm.c10
3 files changed, 63 insertions, 24 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 30b21e131ed..168df3285b2 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1382,18 +1382,33 @@ static char *rna_def_property_lookup_int_func(FILE *f,
if (dp->dnalengthname || dp->dnalengthfixed) {
if (dp->dnalengthname)
- fprintf(f, "\n rna_array_lookup_int(ptr, &RNA_%s, data->%s, sizeof(data->%s[0]), data->%s, index);\n",
- item_type, dp->dnaname, dp->dnaname, dp->dnalengthname);
+ fprintf(f,
+ "\n rna_array_lookup_int(ptr, &RNA_%s, data->%s, sizeof(data->%s[0]), data->%s, "
+ "index);\n",
+ item_type,
+ dp->dnaname,
+ dp->dnaname,
+ dp->dnalengthname);
else
- fprintf(f, "\n rna_array_lookup_int(ptr, &RNA_%s, data->%s, sizeof(data->%s[0]), %d, index);\n",
- item_type, dp->dnaname, dp->dnaname, dp->dnalengthfixed);
+ fprintf(
+ f,
+ "\n rna_array_lookup_int(ptr, &RNA_%s, data->%s, sizeof(data->%s[0]), %d, index);\n",
+ item_type,
+ dp->dnaname,
+ dp->dnaname,
+ dp->dnalengthfixed);
}
else {
if (dp->dnapointerlevel == 0)
- fprintf(f, "\n return rna_listbase_lookup_int(ptr, &RNA_%s, &data->%s, index);\n",
- item_type, dp->dnaname);
+ fprintf(f,
+ "\n return rna_listbase_lookup_int(ptr, &RNA_%s, &data->%s, index);\n",
+ item_type,
+ dp->dnaname);
else
- fprintf(f, "\n return rna_listbase_lookup_int(ptr, &RNA_%s, data->%s, index);\n", item_type, dp->dnaname);
+ fprintf(f,
+ "\n return rna_listbase_lookup_int(ptr, &RNA_%s, data->%s, index);\n",
+ item_type,
+ dp->dnaname);
}
#endif
@@ -2275,13 +2290,23 @@ static void rna_def_property_funcs_impl_cpp(FILE *f, StructRNA *srna, PropertyDe
CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)dp->prop;
if (cprop->type)
- fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s, %s, %s, %s)", (const char *)cprop->type, srna->identifier,
- prop->identifier, (cprop->length ? "true" : "false"),
- (cprop->lookupint ? "true" : "false"), (cprop->lookupstring ? "true" : "false"));
+ fprintf(f,
+ "\tCOLLECTION_PROPERTY(%s, %s, %s, %s, %s, %s)",
+ (const char *)cprop->type,
+ srna->identifier,
+ prop->identifier,
+ (cprop->length ? "true" : "false"),
+ (cprop->lookupint ? "true" : "false"),
+ (cprop->lookupstring ? "true" : "false"));
else
- fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s, %s, %s, %s)", "UnknownType", srna->identifier,
- prop->identifier, (cprop->length ? "true" : "false"),
- (cprop->lookupint ? "true" : "false"), (cprop->lookupstring ? "true" : "false"));
+ fprintf(f,
+ "\tCOLLECTION_PROPERTY(%s, %s, %s, %s, %s, %s)",
+ "UnknownType",
+ srna->identifier,
+ prop->identifier,
+ (cprop->length ? "true" : "false"),
+ (cprop->lookupint ? "true" : "false"),
+ (cprop->lookupstring ? "true" : "false"));
#endif
break;
}
diff --git a/source/blender/makesrna/intern/rna_boid.c b/source/blender/makesrna/intern/rna_boid.c
index f533a8017de..95c5a31db8e 100644
--- a/source/blender/makesrna/intern/rna_boid.c
+++ b/source/blender/makesrna/intern/rna_boid.c
@@ -75,12 +75,26 @@ const EnumPropertyItem rna_enum_boidrule_type_items[] = {
"Maintain speed, flight level or wander"},
{eBoidRuleType_Fight, "FIGHT", 0, "Fight", "Go to closest enemy and attack when in range"},
#if 0
- {eBoidRuleType_Protect, "PROTECT", 0, "Protect", "Go to enemy closest to target and attack when in range"},
- {eBoidRuleType_Hide, "HIDE", 0, "Hide", "Find a deflector move to it's other side from closest enemy"},
- {eBoidRuleType_FollowPath, "FOLLOW_PATH", 0, "Follow Path",
- "Move along a assigned curve or closest curve in a group"},
- {eBoidRuleType_FollowWall, "FOLLOW_WALL", 0, "Follow Wall",
- "Move next to a deflector object's in direction of it's tangent"},
+ {eBoidRuleType_Protect,
+ "PROTECT",
+ 0,
+ "Protect",
+ "Go to enemy closest to target and attack when in range"},
+ {eBoidRuleType_Hide,
+ "HIDE",
+ 0,
+ "Hide",
+ "Find a deflector move to it's other side from closest enemy"},
+ {eBoidRuleType_FollowPath,
+ "FOLLOW_PATH",
+ 0,
+ "Follow Path",
+ "Move along a assigned curve or closest curve in a group"},
+ {eBoidRuleType_FollowWall,
+ "FOLLOW_WALL",
+ 0,
+ "Follow Wall",
+ "Move next to a deflector object's in direction of it's tangent"},
#endif
{0, NULL, 0, NULL, NULL},
};
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 550f90d7e7d..e3c2f9d5233 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -420,11 +420,11 @@ const EnumPropertyItem rna_enum_event_type_mask_items[] = {
#if 0
static const EnumPropertyItem keymap_modifiers_items[] = {
- {KM_ANY, "ANY", 0, "Any", ""},
- {0, "NONE", 0, "None", ""},
- {1, "FIRST", 0, "First", ""},
- {2, "SECOND", 0, "Second", ""},
- {0, NULL, 0, NULL, NULL},
+ {KM_ANY, "ANY", 0, "Any", ""},
+ {0, "NONE", 0, "None", ""},
+ {1, "FIRST", 0, "First", ""},
+ {2, "SECOND", 0, "Second", ""},
+ {0, NULL, 0, NULL, NULL},
};
#endif