diff options
author | Thomas Dinges <blender@dingto.org> | 2012-05-29 14:21:07 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2012-05-29 14:21:07 +0400 |
commit | 16117143d8f12dac65caa8368f56a7e8af8f0db2 (patch) | |
tree | 365d68a11bc4a898a863bf8c229d8cda629d9dc7 /source/blender/render | |
parent | df8880a81f5ba212c49c357294774119c16fd13e (diff) |
Massive Code cleanup:
* Remove all code for Texture and Sequencer plugin system, this never worked in 2.5x / 2.6x and is therefore not needed anymore.
* DNA structures are kept, all read/writefile code is gone.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/render_texture.c | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 16b6eddaa29..5c45be3f03a 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -54,7 +54,6 @@ #include "BKE_colortools.h" #include "BKE_image.h" #include "BKE_node.h" -#include "BKE_plugin_types.h" #include "BKE_animsys.h" #include "BKE_DerivedMesh.h" @@ -103,13 +102,6 @@ static void init_render_texture(Render *re, Tex *tex) BKE_image_user_frame_calc(&tex->iuser, cfra, re?re->flag & R_SEC_FIELD:0); } - if (tex->type==TEX_PLUGIN) { - if (tex->plugin && tex->plugin->doit) { - if (tex->plugin->cfra) { - *(tex->plugin->cfra)= (float)cfra; //BKE_scene_frame_get(re->scene); // XXX old animsys - timing stuff to be fixed - } - } - } else if (tex->type==TEX_ENVMAP) { /* just in case */ tex->imaflag |= TEX_INTERPOL | TEX_MIPMAP; @@ -747,73 +739,6 @@ static int texnoise(Tex *tex, TexResult *texres) /* ------------------------------------------------------------------------- */ -static int plugintex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexResult *texres) -{ - PluginTex *pit; - int rgbnor=0; - float result[8]= {0.0f}; - - texres->tin= 0.0; - - pit= tex->plugin; - if (pit && pit->doit) { - if (texres->nor) { - if (pit->version < 6) { - copy_v3_v3(pit->result+5, texres->nor); - } - else { - copy_v3_v3(result+5, texres->nor); - } - } - if (pit->version < 6) { - if (osatex) rgbnor= ((TexDoitold)pit->doit)(tex->stype, - pit->data, texvec, dxt, dyt); - else rgbnor= ((TexDoitold)pit->doit)(tex->stype, - 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, NULL, NULL, result); - } - - if (pit->version < 6) { - texres->tin = pit->result[0]; - } - else { - texres->tin = result[0]; /* XXX, assigning garbage value, fixme! */ - } - - if (rgbnor & TEX_NOR) { - if (texres->nor) { - if (pit->version < 6) { - copy_v3_v3(texres->nor, pit->result+5); - } - else { - copy_v3_v3(texres->nor, result+5); - } - } - } - - if (rgbnor & TEX_RGB) { - if (pit->version < 6) { - copy_v4_v4(&texres->tr, pit->result + 1); - } - else { - copy_v4_v4(&texres->tr, result + 1); - } - - BRICONTRGB; - } - - BRICONT; - } - - return rgbnor; -} - - static int cubemap_glob(const float n[3], float x, float y, float z, float *adr1, float *adr2) { float x1, y1, z1, nor[3]; @@ -1210,9 +1135,6 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, else retval= imagewrap(tex, tex->ima, NULL, texvec, texres); BKE_image_tag_time(tex->ima); /* tag image as having being used */ break; - case TEX_PLUGIN: - retval= plugintex(tex, texvec, dxt, dyt, osatex, texres); - break; case TEX_ENVMAP: retval= envmaptex(tex, texvec, dxt, dyt, osatex, texres); break; |