griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: style, duplicate header

Browse Source
This commit is contained in:
Campbell Barton
2018-07-12 11:16:22 +02:00
parent a2929edf28
commit e387a4e768
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/scene.c
View File

@@ -101,7 +101,6 @@
#include "DEG_depsgraph_debug.h"
#include "DEG_depsgraph_query.h"
#include "RE_engine.h"
#include "RE_engine.h"
#include "engines/eevee/eevee_lightcache.h"

5
source/blender/draw/engines/basic/basic_engine.c
View File

@@ -150,7 +150,7 @@ static void basic_cache_populate(void *vedata, Object *ob)
for (ParticleSystem *psys = ob->particlesystem.first;
psys != NULL;
psys = psys->next)
{
{
if (!psys_check_enabled(ob, psys, false)) {
continue;
}
@@ -158,8 +158,7 @@ static void basic_cache_populate(void *vedata, Object *ob)
continue;
}
ParticleSettings *part = psys->part;
const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as
: part->draw_as;
const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as;
if (draw_as == PART_DRAW_PATH) {
struct Gwn_Batch *hairs = DRW_cache_particles_get_hair(ob, psys, NULL);
DRW_shgroup_call_add(stl->g_data->depth_shgrp, hairs, NULL);

5
source/blender/draw/engines/eevee/eevee_lightprobes.c
View File

@@ -313,7 +313,8 @@ void EEVEE_lightprobes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
}
if ((scene_eval->eevee.light_cache == NULL) &&
(sldata->fallback_lightcache == NULL)) {
(sldata->fallback_lightcache == NULL))
{
#if defined(IRRADIANCE_SH_L2)
int grid_res = 4;
#elif defined(IRRADIANCE_CUBEMAP)
@@ -860,7 +861,7 @@ void EEVEE_lightprobes_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
/** \name Rendering
* \{ */
typedef struct EEVEE_BakeRenderData{
typedef struct EEVEE_BakeRenderData {
EEVEE_Data *vedata;
EEVEE_ViewLayerData *sldata;
struct GPUFrameBuffer **face_fb; /* should contain 6 framebuffer */