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>2017-12-04 09:19:34 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-12-04 09:20:26 +0300
commit9dfbd98339984e885c3b48142c97f3b516520e73 (patch)
treec70bf74f74d728fb3fb9918f1b402682b13f3eeb /source/blender/draw
parent1b2f8b27540f6154dc968f216297ab9badccd271 (diff)
Cleanup: whitespace
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/eevee/eevee_materials.c2
-rw-r--r--source/blender/draw/engines/eevee/eevee_motion_blur.c2
-rw-r--r--source/blender/draw/engines/eevee/eevee_temporal_sampling.c6
-rw-r--r--source/blender/draw/engines/eevee/eevee_volumes.c2
-rw-r--r--source/blender/draw/intern/draw_manager.c5
5 files changed, 8 insertions, 9 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 38f2aab4443..41564bb2703 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -1295,7 +1295,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sld
/* Do not render surface if we are rendering a volume object
* and do not have a surface closure. */
if (use_volume_material &&
- (gpumat_array[i] && !GPU_material_use_domain_surface(gpumat_array[i])))
+ (gpumat_array[i] && !GPU_material_use_domain_surface(gpumat_array[i])))
{
continue;
}
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c
index 43aaec1b4ba..d5e0a05f9ed 100644
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.c
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c
@@ -19,7 +19,7 @@
*
*/
-/** \file eevee_effects.c
+/** \file eevee_motion_blur.c
* \ingroup draw_engine
*
* Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ...
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index 72b8c85b7a7..5faac4c42cc 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -56,9 +56,9 @@ int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data
IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE);
if (BKE_collection_engine_property_value_get_int(props, "taa_samples") != 1 &&
- /* FIXME the motion blur camera evaluation is tagging view_updated
- * thus making the TAA always reset and never stopping rendering. */
- (effects->enabled_effects & EFFECT_MOTION_BLUR) == 0)
+ /* FIXME the motion blur camera evaluation is tagging view_updated
+ * thus making the TAA always reset and never stopping rendering. */
+ (effects->enabled_effects & EFFECT_MOTION_BLUR) == 0)
{
const float *viewport_size = DRW_viewport_size_get();
float persmat[4][4], viewmat[4][4];
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index 14383e28cc7..dfb88572cf8 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -19,7 +19,7 @@
*
*/
-/** \file eevee_volume.c
+/** \file eevee_volumes.c
* \ingroup draw_engine
*
* Volumetric effects rendering using frostbite approach.
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 436bcbaad9f..264fc079e42 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1449,7 +1449,7 @@ void DRW_pass_sort_shgroup_z(DRWPass *pass)
DRWShadingGroup *last = pass->shgroups;
while ((last = last->next)) {
/* Do nothing */
- };
+ }
pass->shgroups_last = last;
}
}
@@ -2044,8 +2044,7 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
}
}
else {
- for (DRWCall *call = shgroup->calls_first; call; call = call->head.prev)
- {
+ for (DRWCall *call = shgroup->calls_first; call; call = call->head.prev) {
bool neg_scale = is_negative_m4(call->obmat);
/* Negative scale objects */