From 56b9a3e2ad2592000cce7c8af6e34e1d3124ec69 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Sat, 3 Dec 2011 20:45:35 +0000
Subject: [PATCH] Fix #29488: two addons broken after recent noise module
change, patch by Patrick Zulke.
---
add_curve_aceous_galore.py | 2 +-
add_mesh_ant_landscape.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/add_curve_aceous_galore.py b/add_curve_aceous_galore.py
index 7c53c6cde..d9e1e0835 100644
--- a/add_curve_aceous_galore.py
+++ b/add_curve_aceous_galore.py
@@ -38,7 +38,7 @@ import bpy
from bpy.props import *
from mathutils import *
from math import *
-import noise as Noise
+import mathutils.noise as Noise
###------------------------------------------------------------
#### Some functions to use with others:
###------------------------------------------------------------
diff --git a/add_mesh_ant_landscape.py b/add_mesh_ant_landscape.py
index b31d82346..895054823 100644
--- a/add_mesh_ant_landscape.py
+++ b/add_mesh_ant_landscape.py
@@ -73,7 +73,7 @@ Strata type: Strata types, Smooth, Sharp-sub, Sharp-add
import bpy
from bpy.props import *
from mathutils import *
-from noise import *
+from mathutils.noise import *
from math import *
@@ -318,7 +318,7 @@ def landscape_gen(x,y,z,falloffsize,options=[0,1.0,1, 0,0,1.0,0,6,1.0,2.0,1.0,2.
elif ntype == 3: value = hetero_terrain( ncoords, dimension, lacunarity, depth, offset, nbasis ) * 0.25
elif ntype == 4: value = fractal( ncoords, dimension, lacunarity, depth, nbasis )
elif ntype == 5: value = turbulence_vector( ncoords, depth, hardnoise, nbasis )[0]
- elif ntype == 6: value = vl_vector( ncoords, distortion, nbasis, vlbasis ) + 0.5
+ elif ntype == 6: value = variable_lacunarity( ncoords, distortion, nbasis, vlbasis ) + 0.5
elif ntype == 7: value = marble_noise( x*2.0/falloffsize,y*2.0/falloffsize,z*2/falloffsize, origin, nsize, marbleshape, marblebias, marblesharpnes, distortion, depth, hardnoise, nbasis )
elif ntype == 8: value = shattered_hterrain( ncoords[0], ncoords[1], ncoords[2], dimension, lacunarity, depth, offset, distortion, nbasis )
elif ntype == 9: value = strata_hterrain( ncoords[0], ncoords[1], ncoords[2], dimension, lacunarity, depth, offset, distortion, nbasis )
--
GitLab