[Bf-blender-cvs] [73aac1b919e] blender2.8: Draw manager: Cleanup, indentation in preprocessor
Sergey Sharybin
noreply at git.blender.org
Wed Nov 29 11:09:00 CET 2017
Commit: 73aac1b919eba438f2a452087c8817aa44ae3e71
Author: Sergey Sharybin
Date: Wed Nov 29 10:22:53 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB73aac1b919eba438f2a452087c8817aa44ae3e71
Draw manager: Cleanup, indentation in preprocessor
===================================================================
M source/blender/draw/engines/clay/clay_engine.c
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c
index 27ae4639e8b..c7c591555d5 100644
--- a/source/blender/draw/engines/clay/clay_engine.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -932,4 +932,4 @@ RenderEngineType DRW_engine_viewport_clay_type = {
#undef CLAY_ENGINE
-#endif
+#endif /* WITH_CLAY_ENGINE */
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 281e9e2fce1..f039ac3eabb 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -47,11 +47,11 @@ extern struct DrawEngineType draw_engine_eevee_type;
#define IRRADIANCE_HL2
#if defined(IRRADIANCE_SH_L2)
-#define SHADER_IRRADIANCE "#define IRRADIANCE_SH_L2\n"
+# define SHADER_IRRADIANCE "#define IRRADIANCE_SH_L2\n"
#elif defined(IRRADIANCE_CUBEMAP)
-#define SHADER_IRRADIANCE "#define IRRADIANCE_CUBEMAP\n"
+# define SHADER_IRRADIANCE "#define IRRADIANCE_CUBEMAP\n"
#elif defined(IRRADIANCE_HL2)
-#define SHADER_IRRADIANCE "#define IRRADIANCE_HL2\n"
+# define SHADER_IRRADIANCE "#define IRRADIANCE_HL2\n"
#endif
#define SHADER_DEFINES \
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 0986e4c48b4..ca36e054613 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -101,29 +101,29 @@
#define USE_PROFILE
#ifdef USE_PROFILE
-#include "PIL_time.h"
+# include "PIL_time.h"
-#define PROFILE_TIMER_FALLOFF 0.1
+# define PROFILE_TIMER_FALLOFF 0.1
-#define PROFILE_START(time_start) \
+# define PROFILE_START(time_start) \
double time_start = PIL_check_seconds_timer();
-#define PROFILE_END_ACCUM(time_accum, time_start) { \
+# define PROFILE_END_ACCUM(time_accum, time_start) { \
time_accum += (PIL_check_seconds_timer() - time_start) * 1e3; \
} ((void)0)
/* exp average */
-#define PROFILE_END_UPDATE(time_update, time_start) { \
+# define PROFILE_END_UPDATE(time_update, time_start) { \
double _time_delta = (PIL_check_seconds_timer() - time_start) * 1e3; \
time_update = (time_update * (1.0 - PROFILE_TIMER_FALLOFF)) + \
(_time_delta * PROFILE_TIMER_FALLOFF); \
} ((void)0)
-#else
+#else /* USE_PROFILE */
-#define PROFILE_START(time_start) ((void)0)
-#define PROFILE_END_ACCUM(time_accum, time_start) ((void)0)
-#define PROFILE_END_UPDATE(time_update, time_start) ((void)0)
+# define PROFILE_START(time_start) ((void)0)
+# define PROFILE_END_ACCUM(time_accum, time_start) ((void)0)
+# define PROFILE_END_UPDATE(time_update, time_start) ((void)0)
#endif /* USE_PROFILE */
More information about the Bf-blender-cvs
mailing list