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_texture_api.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_texture_api.c')
-rw-r--r--source/blender/makesrna/intern/rna_texture_api.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c
index b3bd55e3ee3..059c0b8208c 100644
--- a/source/blender/makesrna/intern/rna_texture_api.c
+++ b/source/blender/makesrna/intern/rna_texture_api.c
@@ -26,49 +26,49 @@
#include "RNA_define.h"
-#include "rna_internal.h" /* own include */
+#include "rna_internal.h" /* own include */
#ifdef RNA_RUNTIME
-#include "IMB_imbuf.h"
-#include "IMB_imbuf_types.h"
-#include "DNA_scene_types.h"
-#include "BKE_context.h"
-#include "BKE_global.h"
-#include "RE_pipeline.h"
-#include "RE_shader_ext.h"
+# include "IMB_imbuf.h"
+# include "IMB_imbuf_types.h"
+# include "DNA_scene_types.h"
+# include "BKE_context.h"
+# include "BKE_global.h"
+# include "RE_pipeline.h"
+# include "RE_shader_ext.h"
static void texture_evaluate(struct Tex *tex, float value[3], float r_color[4])
{
- TexResult texres = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
+ TexResult texres = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
- /* TODO(sergey): always use color management now. */
- multitex_ext(tex, value, NULL, NULL, 1, &texres, 0, NULL, true, false);
+ /* TODO(sergey): always use color management now. */
+ multitex_ext(tex, value, NULL, NULL, 1, &texres, 0, NULL, true, false);
- r_color[0] = texres.tr;
- r_color[1] = texres.tg;
- r_color[2] = texres.tb;
- r_color[3] = texres.tin;
+ r_color[0] = texres.tr;
+ r_color[1] = texres.tg;
+ r_color[2] = texres.tb;
+ r_color[3] = texres.tin;
}
#else
void RNA_api_texture(StructRNA *srna)
{
- FunctionRNA *func;
- PropertyRNA *parm;
+ FunctionRNA *func;
+ PropertyRNA *parm;
- func = RNA_def_function(srna, "evaluate", "texture_evaluate");
- RNA_def_function_ui_description(func, "Evaluate the texture at the coordinates given");
+ func = RNA_def_function(srna, "evaluate", "texture_evaluate");
+ RNA_def_function_ui_description(func, "Evaluate the texture at the coordinates given");
- parm = RNA_def_float_vector(func, "value", 3, NULL, -FLT_MAX, FLT_MAX, "", "", -1e4, 1e4);
- RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
-
- /* return location and normal */
- parm = RNA_def_float_vector(func, "result", 4, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4);
- RNA_def_parameter_flags(parm, PROP_THICK_WRAP, 0);
- RNA_def_function_output(func, parm);
+ parm = RNA_def_float_vector(func, "value", 3, NULL, -FLT_MAX, FLT_MAX, "", "", -1e4, 1e4);
+ RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+ /* return location and normal */
+ parm = RNA_def_float_vector(
+ func, "result", 4, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4);
+ RNA_def_parameter_flags(parm, PROP_THICK_WRAP, 0);
+ RNA_def_function_output(func, parm);
}
#endif