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-06-03 17:21:57 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-06-03 17:24:38 +0300
commit1f650c402d3b43eee7cb51c7d4f373ba82ac2116 (patch)
treeba2432fe9424ae545d3758d37ec8ebb0419a2ba5 /source/blender/makesrna/intern/rna_ID.c
parente3f2034e7b925bc7e31e65051842cf26d70a20bc (diff)
Cleanup: style, use braces in RNA
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
-rw-r--r--source/blender/makesrna/intern/rna_ID.c117
1 files changed, 78 insertions, 39 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 7e6a3e70b9d..a1144378f09 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -161,8 +161,9 @@ static int rna_ID_name_editable(PointerRNA *ptr, const char **UNUSED(r_info))
if (GS(id->name) == ID_VF) {
VFont *vfont = (VFont *)id;
- if (BKE_vfont_is_builtin(vfont))
+ if (BKE_vfont_is_builtin(vfont)) {
return 0;
+ }
}
else if (!BKE_id_is_in_global_main(id)) {
return 0;
@@ -205,76 +206,111 @@ short RNA_type_to_ID_code(const StructRNA *type)
if (UNLIKELY(base_type == NULL)) {
return 0;
}
- if (base_type == &RNA_Action)
+ if (base_type == &RNA_Action) {
return ID_AC;
- if (base_type == &RNA_Armature)
+ }
+ if (base_type == &RNA_Armature) {
return ID_AR;
- if (base_type == &RNA_Brush)
+ }
+ if (base_type == &RNA_Brush) {
return ID_BR;
- if (base_type == &RNA_CacheFile)
+ }
+ if (base_type == &RNA_CacheFile) {
return ID_CF;
- if (base_type == &RNA_Camera)
+ }
+ if (base_type == &RNA_Camera) {
return ID_CA;
- if (base_type == &RNA_Curve)
+ }
+ if (base_type == &RNA_Curve) {
return ID_CU;
- if (base_type == &RNA_GreasePencil)
+ }
+ if (base_type == &RNA_GreasePencil) {
return ID_GD;
- if (base_type == &RNA_Collection)
+ }
+ if (base_type == &RNA_Collection) {
return ID_GR;
- if (base_type == &RNA_Image)
+ }
+ if (base_type == &RNA_Image) {
return ID_IM;
- if (base_type == &RNA_Key)
+ }
+ if (base_type == &RNA_Key) {
return ID_KE;
- if (base_type == &RNA_Light)
+ }
+ if (base_type == &RNA_Light) {
return ID_LA;
- if (base_type == &RNA_Library)
+ }
+ if (base_type == &RNA_Library) {
return ID_LI;
- if (base_type == &RNA_FreestyleLineStyle)
+ }
+ if (base_type == &RNA_FreestyleLineStyle) {
return ID_LS;
- if (base_type == &RNA_Lattice)
+ }
+ if (base_type == &RNA_Lattice) {
return ID_LT;
- if (base_type == &RNA_Material)
+ }
+ if (base_type == &RNA_Material) {
return ID_MA;
- if (base_type == &RNA_MetaBall)
+ }
+ if (base_type == &RNA_MetaBall) {
return ID_MB;
- if (base_type == &RNA_MovieClip)
+ }
+ if (base_type == &RNA_MovieClip) {
return ID_MC;
- if (base_type == &RNA_Mesh)
+ }
+ if (base_type == &RNA_Mesh) {
return ID_ME;
- if (base_type == &RNA_Mask)
+ }
+ if (base_type == &RNA_Mask) {
return ID_MSK;
- if (base_type == &RNA_NodeTree)
+ }
+ if (base_type == &RNA_NodeTree) {
return ID_NT;
- if (base_type == &RNA_Object)
+ }
+ if (base_type == &RNA_Object) {
return ID_OB;
- if (base_type == &RNA_ParticleSettings)
+ }
+ if (base_type == &RNA_ParticleSettings) {
return ID_PA;
- if (base_type == &RNA_Palette)
+ }
+ if (base_type == &RNA_Palette) {
return ID_PAL;
- if (base_type == &RNA_PaintCurve)
+ }
+ if (base_type == &RNA_PaintCurve) {
return ID_PC;
- if (base_type == &RNA_LightProbe)
+ }
+ if (base_type == &RNA_LightProbe) {
return ID_LP;
- if (base_type == &RNA_Scene)
+ }
+ if (base_type == &RNA_Scene) {
return ID_SCE;
- if (base_type == &RNA_Screen)
+ }
+ if (base_type == &RNA_Screen) {
return ID_SCR;
- if (base_type == &RNA_Sound)
+ }
+ if (base_type == &RNA_Sound) {
return ID_SO;
- if (base_type == &RNA_Speaker)
+ }
+ if (base_type == &RNA_Speaker) {
return ID_SPK;
- if (base_type == &RNA_Texture)
+ }
+ if (base_type == &RNA_Texture) {
return ID_TE;
- if (base_type == &RNA_Text)
+ }
+ if (base_type == &RNA_Text) {
return ID_TXT;
- if (base_type == &RNA_VectorFont)
+ }
+ if (base_type == &RNA_VectorFont) {
return ID_VF;
- if (base_type == &RNA_WorkSpace)
+ }
+ if (base_type == &RNA_WorkSpace) {
return ID_WS;
- if (base_type == &RNA_World)
+ }
+ if (base_type == &RNA_World) {
return ID_WO;
- if (base_type == &RNA_WindowManager)
+ }
+ if (base_type == &RNA_WindowManager) {
return ID_WM;
+ }
return 0;
}
@@ -411,8 +447,9 @@ StructRNA *rna_PropertyGroup_register(Main *UNUSED(bmain),
RNA_pointer_create(NULL, &RNA_PropertyGroup, NULL, &dummyptr);
/* validate the python class */
- if (validate(&dummyptr, data, NULL) != 0)
+ if (validate(&dummyptr, data, NULL) != 0) {
return NULL;
+ }
/* note: it looks like there is no length limit on the srna id since its
* just a char pointer, but take care here, also be careful that python
@@ -666,10 +703,12 @@ static void rna_ImagePreview_is_custom_set(PointerRNA *ptr, int value, enum eIco
return;
}
- if (value)
+ if (value) {
prv_img->flag[size] |= PRV_USER_EDITED;
- else
+ }
+ else {
prv_img->flag[size] &= ~PRV_USER_EDITED;
+ }
prv_img->flag[size] |= PRV_CHANGED;