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 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/makesrna/intern/rna_vfont.c
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/makesrna/intern/rna_vfont.c')
-rw-r--r--source/blender/makesrna/intern/rna_vfont.c63
1 files changed, 32 insertions, 31 deletions
diff --git a/source/blender/makesrna/intern/rna_vfont.c b/source/blender/makesrna/intern/rna_vfont.c
index f8b62711c5f..cf61fe07c68 100644
--- a/source/blender/makesrna/intern/rna_vfont.c
+++ b/source/blender/makesrna/intern/rna_vfont.c
@@ -28,59 +28,60 @@
#include "WM_types.h"
-
#ifdef RNA_RUNTIME
-#include "BKE_font.h"
-#include "DNA_object_types.h"
+# include "BKE_font.h"
+# include "DNA_object_types.h"
-#include "DEG_depsgraph.h"
+# include "DEG_depsgraph.h"
-#include "WM_api.h"
+# include "WM_api.h"
/* matching fnction in rna_ID.c */
static int rna_VectorFont_filepath_editable(PointerRNA *ptr, const char **UNUSED(r_info))
{
- VFont *vfont = ptr->id.data;
- if (BKE_vfont_is_builtin(vfont)) {
- return 0;
- }
- return PROP_EDITABLE;
+ VFont *vfont = ptr->id.data;
+ if (BKE_vfont_is_builtin(vfont)) {
+ return 0;
+ }
+ return PROP_EDITABLE;
}
-static void rna_VectorFont_reload_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+static void rna_VectorFont_reload_update(Main *UNUSED(bmain),
+ Scene *UNUSED(scene),
+ PointerRNA *ptr)
{
- VFont *vf = ptr->id.data;
- BKE_vfont_free_data(vf);
+ VFont *vf = ptr->id.data;
+ BKE_vfont_free_data(vf);
- /* update */
- WM_main_add_notifier(NC_GEOM | ND_DATA, NULL);
- DEG_id_tag_update(&vf->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
+ /* update */
+ WM_main_add_notifier(NC_GEOM | ND_DATA, NULL);
+ DEG_id_tag_update(&vf->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
}
#else
void RNA_def_vfont(BlenderRNA *brna)
{
- StructRNA *srna;
- PropertyRNA *prop;
+ StructRNA *srna;
+ PropertyRNA *prop;
- srna = RNA_def_struct(brna, "VectorFont", "ID");
- RNA_def_struct_ui_text(srna, "Vector Font", "Vector font for Text objects");
- RNA_def_struct_sdna(srna, "VFont");
- RNA_def_struct_ui_icon(srna, ICON_FILE_FONT);
+ srna = RNA_def_struct(brna, "VectorFont", "ID");
+ RNA_def_struct_ui_text(srna, "Vector Font", "Vector font for Text objects");
+ RNA_def_struct_sdna(srna, "VFont");
+ RNA_def_struct_ui_icon(srna, ICON_FILE_FONT);
- prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
- RNA_def_property_string_sdna(prop, NULL, "name");
- RNA_def_property_editable_func(prop, "rna_VectorFont_filepath_editable");
- RNA_def_property_ui_text(prop, "File Path", "");
- RNA_def_property_update(prop, NC_GEOM | ND_DATA, "rna_VectorFont_reload_update");
+ prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
+ RNA_def_property_string_sdna(prop, NULL, "name");
+ RNA_def_property_editable_func(prop, "rna_VectorFont_filepath_editable");
+ RNA_def_property_ui_text(prop, "File Path", "");
+ RNA_def_property_update(prop, NC_GEOM | ND_DATA, "rna_VectorFont_reload_update");
- prop = RNA_def_property(srna, "packed_file", PROP_POINTER, PROP_NONE);
- RNA_def_property_pointer_sdna(prop, NULL, "packedfile");
- RNA_def_property_ui_text(prop, "Packed File", "");
+ prop = RNA_def_property(srna, "packed_file", PROP_POINTER, PROP_NONE);
+ RNA_def_property_pointer_sdna(prop, NULL, "packedfile");
+ RNA_def_property_ui_text(prop, "Packed File", "");
- RNA_api_vfont(srna);
+ RNA_api_vfont(srna);
}
#endif