From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: 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 --- source/blender/makesrna/intern/rna_camera_api.c | 88 ++++++++++++++----------- 1 file changed, 50 insertions(+), 38 deletions(-) (limited to 'source/blender/makesrna/intern/rna_camera_api.c') diff --git a/source/blender/makesrna/intern/rna_camera_api.c b/source/blender/makesrna/intern/rna_camera_api.c index 8e181fe3c68..cbbd8377c7f 100644 --- a/source/blender/makesrna/intern/rna_camera_api.c +++ b/source/blender/makesrna/intern/rna_camera_api.c @@ -18,64 +18,76 @@ * \ingroup RNA */ - #include #include #include #include "RNA_define.h" -#include "rna_internal.h" /* own include */ +#include "rna_internal.h" /* own include */ #ifdef RNA_RUNTIME -#include "DNA_scene_types.h" +# include "DNA_scene_types.h" -#include "BKE_camera.h" -#include "BKE_context.h" -#include "BKE_object.h" +# include "BKE_camera.h" +# include "BKE_context.h" +# include "BKE_object.h" -static void rna_camera_view_frame(struct Camera *camera, struct Scene *scene, - float r_vec1[3], float r_vec2[3], float r_vec3[3], float r_vec4[3]) +static void rna_camera_view_frame(struct Camera *camera, + struct Scene *scene, + float r_vec1[3], + float r_vec2[3], + float r_vec3[3], + float r_vec4[3]) { - float vec[4][3]; + float vec[4][3]; - BKE_camera_view_frame(scene, camera, vec); + BKE_camera_view_frame(scene, camera, vec); - copy_v3_v3(r_vec1, vec[0]); - copy_v3_v3(r_vec2, vec[1]); - copy_v3_v3(r_vec3, vec[2]); - copy_v3_v3(r_vec4, vec[3]); + copy_v3_v3(r_vec1, vec[0]); + copy_v3_v3(r_vec2, vec[1]); + copy_v3_v3(r_vec3, vec[2]); + copy_v3_v3(r_vec4, vec[3]); } #else void RNA_api_camera(StructRNA *srna) { - FunctionRNA *func; - PropertyRNA *parm; - - func = RNA_def_function(srna, "view_frame", "rna_camera_view_frame"); - RNA_def_function_ui_description(func, "Return 4 points for the cameras frame (before object transformation)"); - - RNA_def_pointer(func, "scene", "Scene", "", "Scene to use for aspect calculation, when omitted 1:1 aspect is used"); - - /* return location and normal */ - parm = RNA_def_float_vector(func, "result_1", 3, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4); - RNA_def_property_flag(parm, PROP_THICK_WRAP); - RNA_def_function_output(func, parm); - - parm = RNA_def_float_vector(func, "result_2", 3, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4); - RNA_def_property_flag(parm, PROP_THICK_WRAP); - RNA_def_function_output(func, parm); - - parm = RNA_def_float_vector(func, "result_3", 3, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4); - RNA_def_property_flag(parm, PROP_THICK_WRAP); - RNA_def_function_output(func, parm); - - parm = RNA_def_float_vector(func, "result_4", 3, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4); - RNA_def_property_flag(parm, PROP_THICK_WRAP); - RNA_def_function_output(func, parm); + FunctionRNA *func; + PropertyRNA *parm; + + func = RNA_def_function(srna, "view_frame", "rna_camera_view_frame"); + RNA_def_function_ui_description( + func, "Return 4 points for the cameras frame (before object transformation)"); + + RNA_def_pointer(func, + "scene", + "Scene", + "", + "Scene to use for aspect calculation, when omitted 1:1 aspect is used"); + + /* return location and normal */ + parm = RNA_def_float_vector( + func, "result_1", 3, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4); + RNA_def_property_flag(parm, PROP_THICK_WRAP); + RNA_def_function_output(func, parm); + + parm = RNA_def_float_vector( + func, "result_2", 3, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4); + RNA_def_property_flag(parm, PROP_THICK_WRAP); + RNA_def_function_output(func, parm); + + parm = RNA_def_float_vector( + func, "result_3", 3, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4); + RNA_def_property_flag(parm, PROP_THICK_WRAP); + RNA_def_function_output(func, parm); + + parm = RNA_def_float_vector( + func, "result_4", 3, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4); + RNA_def_property_flag(parm, PROP_THICK_WRAP); + RNA_def_function_output(func, parm); } #endif -- cgit v1.2.3