forked from bartvdbraak/blender
Fix compiler warnings from earlier commit.
This commit is contained in:
parent
a86609af8e
commit
ab5f21e24c
@ -97,6 +97,7 @@
|
|||||||
#include "BKE_material.h"
|
#include "BKE_material.h"
|
||||||
#include "BKE_particle.h"
|
#include "BKE_particle.h"
|
||||||
#include "BKE_pointcache.h"
|
#include "BKE_pointcache.h"
|
||||||
|
#include "BKE_texture.h"
|
||||||
#include "BKE_utildefines.h"
|
#include "BKE_utildefines.h"
|
||||||
#include "depsgraph_private.h"
|
#include "depsgraph_private.h"
|
||||||
#include "BKE_bmesh.h"
|
#include "BKE_bmesh.h"
|
||||||
|
@ -847,29 +847,19 @@ void BKE_free_envmap(EnvMap *env)
|
|||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
int BKE_texture_dependsOnTime(const struct Tex *texture)
|
int BKE_texture_dependsOnTime(const struct Tex *texture)
|
||||||
{
|
{
|
||||||
if(texture->plugin)
|
if(texture->plugin) {
|
||||||
{
|
|
||||||
// assume all plugins depend on time
|
// assume all plugins depend on time
|
||||||
return 1;
|
return 1;
|
||||||
}
|
} else if(texture->ima &&
|
||||||
else if(texture->ima)
|
( texture->ima->source == IMA_SRC_SEQUENCE ||
|
||||||
{
|
texture->ima->source == IMA_SRC_MOVIE ||
|
||||||
if(texture->ima->source == IMA_SRC_SEQUENCE ||
|
texture->ima->source == IMA_SRC_GENERATED ) ) {
|
||||||
texture->ima->source == IMA_SRC_MOVIE ||
|
return 1;
|
||||||
texture->ima->source == IMA_SRC_GENERATED)
|
} else if(texture->ipo) {
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if(texture->ipo)
|
|
||||||
{
|
|
||||||
// assume any ipo means the texture is animated
|
// assume any ipo means the texture is animated
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else
|
return 0;
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
Loading…
Reference in New Issue
Block a user