Cleanup: compiler warnings
This commit is contained in:
parent
831b85efb2
commit
11e4eafd9b
|
@ -390,8 +390,7 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata,
|
|||
Scene *scene,
|
||||
Object *ob)
|
||||
{
|
||||
const DRWContextState *draw_ctx = DRW_context_state_get();
|
||||
static float white[3] = {1.0f, 1.0f, 1.0f};
|
||||
static const float white[3] = {1.0f, 1.0f, 1.0f};
|
||||
|
||||
float *texcoloc = NULL;
|
||||
float *texcosize = NULL;
|
||||
|
@ -443,8 +442,11 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata,
|
|||
|
||||
/* Don't show smoke before simulation starts, this could be made an option in the future. */
|
||||
/* (sebbas): Always show smoke for manta */
|
||||
/* const bool show_smoke = ((int)DEG_get_ctime(draw_ctx->depsgraph) >=
|
||||
* mds->point_cache[0]->startframe); */
|
||||
#if 0
|
||||
const DRWContextState *draw_ctx = DRW_context_state_get();
|
||||
const bool show_smoke = ((int)DEG_get_ctime(draw_ctx->depsgraph) >=
|
||||
*mds->point_cache[0]->startframe);
|
||||
#endif
|
||||
|
||||
if (mds->fluid && (mds->type == FLUID_DOMAIN_TYPE_GAS) /* && show_smoke */) {
|
||||
if (!(mds->flags & FLUID_DOMAIN_USE_NOISE)) {
|
||||
|
@ -462,7 +464,6 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata,
|
|||
grp, "sampflame", mds->tex_flame ? &mds->tex_flame : &e_data.dummy_flame);
|
||||
|
||||
/* Constant Volume color. */
|
||||
static float white[3] = {1.0f, 1.0f, 1.0f};
|
||||
bool use_constant_color = ((mds->active_fields & FLUID_DOMAIN_ACTIVE_COLORS) == 0 &&
|
||||
(mds->active_fields & FLUID_DOMAIN_ACTIVE_COLOR_SET) != 0);
|
||||
|
||||
|
|
|
@ -471,9 +471,6 @@ static void fluid_free_startjob(void *customdata, short *stop, short *do_update,
|
|||
FluidDomainSettings *mds = job->mmd->domain;
|
||||
Scene *scene = job->scene;
|
||||
|
||||
char tmpDir[FILE_MAX];
|
||||
tmpDir[0] = '\0';
|
||||
|
||||
job->stop = stop;
|
||||
job->do_update = do_update;
|
||||
job->progress = progress;
|
||||
|
|
|
@ -62,7 +62,9 @@ typedef enum ModifierType {
|
|||
eModifierType_SimpleDeform = 28,
|
||||
eModifierType_Multires = 29,
|
||||
eModifierType_Surface = 30,
|
||||
#ifdef DNA_DEPRECATED
|
||||
eModifierType_Smoke = 31,
|
||||
#endif
|
||||
eModifierType_ShapeKey = 32,
|
||||
eModifierType_Solidify = 33,
|
||||
eModifierType_Screw = 34,
|
||||
|
|
|
@ -718,7 +718,6 @@ static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr)
|
|||
return &RNA_WeightedNormalModifier;
|
||||
/* Default */
|
||||
case eModifierType_Fluidsim: /* deprecated */
|
||||
case eModifierType_Smoke:
|
||||
case eModifierType_None:
|
||||
case eModifierType_ShapeKey:
|
||||
case NUM_MODIFIER_TYPES:
|
||||
|
|
Loading…
Reference in New Issue