diff options
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_texture.c | 8 | ||||
-rw-r--r-- | source/blender/render/intern/source/strand.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 1dc709d27df..72bec0cb596 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4881,7 +4881,6 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp /* used to be 'rotate scene' */ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int lay, int use_camera_view) { - extern int slurph_opt; /* key.c */ Scene *sce; float mat[4][4]; float amb[3]; @@ -5044,7 +5043,6 @@ void RE_DataBase_GetView(Render *re, float mat[][4]) static void database_fromscene_vectors(Render *re, Scene *scene, unsigned int lay, int timeoffset) { - extern int slurph_opt; /* key.c */ float mat[4][4]; re->scene= scene; diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 951c171608a..62e684e79e2 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -83,7 +83,7 @@ extern struct Render R; -void init_render_texture(Render *re, Tex *tex) +static void init_render_texture(Render *re, Tex *tex) { int cfra= re->scene->r.cfra; @@ -137,7 +137,7 @@ void init_render_textures(Render *re) } } -void end_render_texture(Tex *tex) +static void end_render_texture(Tex *tex) { if(tex && tex->use_nodes && tex->nodetree) ntreeEndExecTree(tex->nodetree); @@ -759,12 +759,12 @@ static int plugintex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex if(osatex) rgbnor= ((TexDoitold)pit->doit)(tex->stype, pit->data, texvec, dxt, dyt); else rgbnor= ((TexDoitold)pit->doit)(tex->stype, - pit->data, texvec, 0, 0); + pit->data, texvec, NULL, NULL); } else { if(osatex) rgbnor= ((TexDoit)pit->doit)(tex->stype, pit->data, texvec, dxt, dyt, result); else rgbnor= ((TexDoit)pit->doit)(tex->stype, - pit->data, texvec, 0, 0, result); + pit->data, texvec, NULL, NULL, result); } if (pit->version < 6) { diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index 099bf76f40b..4e728c3e59e 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -314,7 +314,7 @@ struct StrandShadeCache { MemArena *memarena; }; -StrandShadeCache *strand_shade_cache_create() +StrandShadeCache *strand_shade_cache_create(void) { StrandShadeCache *cache; |