archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2018-10-29 10:24:42 +11:00
parent 05588f909a
commit 26ed545276
10 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/engines/eevee/eevee_lightcache.c
View File

@@ -472,13 +472,15 @@ static void eevee_lightbake_create_resources(EEVEE_LightBake *lbake)
lbake->lcache = eevee->light_cache; lbake->lcache = eevee->light_cache;
/* TODO validate irradiance and reflection cache independently... */ /* TODO validate irradiance and reflection cache independently... */
if (!EEVEE_lightcache_validate(lbake->lcache, lbake->cube_len, lbake->ref_cube_res, lbake->grid_len, lbake->irr_size)) if (!EEVEE_lightcache_validate(
lbake->lcache, lbake->cube_len, lbake->ref_cube_res, lbake->grid_len, lbake->irr_size))
{ {
eevee->light_cache = lbake->lcache = NULL; eevee->light_cache = lbake->lcache = NULL;
} }
if (lbake->lcache == NULL) { if (lbake->lcache == NULL) {
lbake->lcache = EEVEE_lightcache_create(lbake->grid_len, lbake->lcache = EEVEE_lightcache_create(
lbake->grid_len,
lbake->cube_len, lbake->cube_len,
lbake->ref_cube_res, lbake->ref_cube_res,
lbake->vis_res, lbake->vis_res,

9
source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
View File

@@ -24,7 +24,7 @@
* *
*/ */
/** \file blender/gpencil_modifiers/intern/MOD_gpencilinstance.c /** \file blender/gpencil_modifiers/intern/MOD_gpencilarray.c
* \ingroup modifiers * \ingroup modifiers
*/ */
@@ -61,10 +61,6 @@
#include "MOD_gpencil_util.h" #include "MOD_gpencil_util.h"
#include "MOD_gpencil_modifiertypes.h" #include "MOD_gpencil_modifiertypes.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
#include "DEG_depsgraph_query.h"
static void initData(GpencilModifierData *md) static void initData(GpencilModifierData *md)
{ {
ArrayGpencilModifierData *gpmd = (ArrayGpencilModifierData *)md; ArrayGpencilModifierData *gpmd = (ArrayGpencilModifierData *)md;
@@ -177,7 +173,8 @@ static void generate_geometry(
/* Record whether this stroke can be used /* Record whether this stroke can be used
* ATTENTION: The logic here is the inverse of what's used everywhere else! * ATTENTION: The logic here is the inverse of what's used everywhere else!
*/ */
if (is_stroke_affected_by_modifier(ob, if (is_stroke_affected_by_modifier(
ob,
mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps, mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps,
mmd->flag & GP_ARRAY_INVERT_LAYER, mmd->flag & GP_ARRAY_INVERT_PASS, mmd->flag & GP_ARRAY_INVERT_LAYER, mmd->flag & GP_ARRAY_INVERT_PASS,
mmd->flag & GP_ARRAY_INVERT_LAYERPASS)) mmd->flag & GP_ARRAY_INVERT_LAYERPASS))

3
source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
View File

@@ -77,7 +77,8 @@ static void deformStroke(
ColorGpencilModifierData *mmd = (ColorGpencilModifierData *)md; ColorGpencilModifierData *mmd = (ColorGpencilModifierData *)md;
float hsv[3], factor[3]; float hsv[3], factor[3];
if (!is_stroke_affected_by_modifier(ob, if (!is_stroke_affected_by_modifier(
ob,
mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps, mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps,
mmd->flag & GP_COLOR_INVERT_LAYER, mmd->flag & GP_COLOR_INVERT_PASS, mmd->flag & GP_COLOR_INVERT_LAYER, mmd->flag & GP_COLOR_INVERT_PASS,
mmd->flag & GP_COLOR_INVERT_LAYERPASS)) mmd->flag & GP_COLOR_INVERT_LAYERPASS))

3
source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
View File

@@ -208,7 +208,8 @@ static void deformStroke(
float dmat[4][4]; float dmat[4][4];
struct GPHookData_cb tData; struct GPHookData_cb tData;
if (!is_stroke_affected_by_modifier(ob, if (!is_stroke_affected_by_modifier(
ob,
mmd->layername, mmd->pass_index, mmd->layer_pass, 3, gpl, gps, mmd->layername, mmd->pass_index, mmd->layer_pass, 3, gpl, gps,
mmd->flag & GP_HOOK_INVERT_LAYER, mmd->flag & GP_HOOK_INVERT_PASS, mmd->flag & GP_HOOK_INVERT_LAYER, mmd->flag & GP_HOOK_INVERT_PASS,
mmd->flag & GP_HOOK_INVERT_LAYERPASS)) mmd->flag & GP_HOOK_INVERT_LAYERPASS))

3
source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
View File

@@ -81,7 +81,8 @@ static void deformStroke(
LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md; LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md;
const int def_nr = defgroup_name_index(ob, mmd->vgname); const int def_nr = defgroup_name_index(ob, mmd->vgname);
if (!is_stroke_affected_by_modifier(ob, if (!is_stroke_affected_by_modifier(
ob,
mmd->layername, mmd->pass_index, mmd->layer_pass, 3, gpl, gps, mmd->layername, mmd->pass_index, mmd->layer_pass, 3, gpl, gps,
mmd->flag & GP_LATTICE_INVERT_LAYER, mmd->flag & GP_LATTICE_INVERT_PASS, mmd->flag & GP_LATTICE_INVERT_LAYER, mmd->flag & GP_LATTICE_INVERT_PASS,
mmd->flag & GP_LATTICE_INVERT_LAYERPASS)) mmd->flag & GP_LATTICE_INVERT_LAYERPASS))

3
source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
View File

@@ -116,7 +116,8 @@ static void deformStroke(
mmd->rng = BLI_rng_new(rng_seed); mmd->rng = BLI_rng_new(rng_seed);
} }
if (!is_stroke_affected_by_modifier(ob, if (!is_stroke_affected_by_modifier(
ob,
mmd->layername, mmd->pass_index, mmd->layer_pass, 3, gpl, gps, mmd->layername, mmd->pass_index, mmd->layer_pass, 3, gpl, gps,
mmd->flag & GP_NOISE_INVERT_LAYER, mmd->flag & GP_NOISE_INVERT_PASS, mmd->flag & GP_NOISE_INVERT_LAYER, mmd->flag & GP_NOISE_INVERT_PASS,
mmd->flag & GP_NOISE_INVERT_LAYERPASS)) mmd->flag & GP_NOISE_INVERT_LAYERPASS))