Ocean Sim modifier patch
[blender.git] / source / blender / render / intern / source / render_texture.c
index afc52f7c92a9a60f54c6d010e3252f89d5b7dcb9..bd323a5b2d301c422b1e5de0b45f68c8455ece8a 100644 (file)
@@ -79,6 +79,7 @@
 #include "rendercore.h"
 #include "shading.h"
 #include "texture.h"
+#include "texture_ocean.h"
 
 #include "renderdatabase.h" /* needed for UV */
 
@@ -1264,7 +1265,9 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex,
        case TEX_VOXELDATA:
                retval= voxeldatatex(tex, texvec, texres);  
                break;
-
+       case TEX_OCEAN:
+               retval= ocean_texture(tex, texvec, texres);  
+               break;
        }
 
        if (tex->flag & TEX_COLORBAND) {
@@ -2193,6 +2196,12 @@ void do_material_tex(ShadeInput *shi, Render *re)
                                use_ntap_bump = 0;
                                use_compat_bump = 1;
                        }
+                       
+                       /* case ocean */
+                       if(tex->type == TEX_OCEAN) {
+                               use_ntap_bump = 0;
+                               use_compat_bump = 0;
+                       }
 
                        /* which coords */
                        if(mtex->texco==TEXCO_ORCO) {