[Bf-extensions-cvs] [884a381] master: Updated module imports to the new package name object_physics_meadow.
Lukas Tönne
noreply at git.blender.org
Wed Nov 26 11:28:35 CET 2014
Commit: 884a3814aa18ce67f678c99ba0ecad3384cb723c
Author: Lukas Tönne
Date: Wed Nov 26 11:25:56 2014 +0100
Branches: master
https://developer.blender.org/rBAC884a3814aa18ce67f678c99ba0ecad3384cb723c
Updated module imports to the new package name object_physics_meadow.
===================================================================
M object_physics_meadow/__init__.py
M object_physics_meadow/blob.py
M object_physics_meadow/dupliparticle.py
M object_physics_meadow/hierarchical_dart_throw.py
M object_physics_meadow/meadow.py
M object_physics_meadow/patch.py
M object_physics_meadow/settings.py
M object_physics_meadow/ui.py
===================================================================
diff --git a/object_physics_meadow/__init__.py b/object_physics_meadow/__init__.py
index 32e6e70..2b92d2d 100644
--- a/object_physics_meadow/__init__.py
+++ b/object_physics_meadow/__init__.py
@@ -29,7 +29,7 @@ bl_info = {
"category": "Development"}
import bpy
-from meadow import settings, ui
+from object_physics_meadow import settings, ui
def register():
settings.register()
diff --git a/object_physics_meadow/blob.py b/object_physics_meadow/blob.py
index a18f356..717f262 100644
--- a/object_physics_meadow/blob.py
+++ b/object_physics_meadow/blob.py
@@ -24,10 +24,10 @@ from math import *
from mathutils import *
from mathutils.kdtree import KDTree
-from meadow import settings as _settings
-from meadow import duplimesh
-from meadow.duplimesh import project_on_ground
-from meadow.util import *
+from object_physics_meadow import settings as _settings
+from object_physics_meadow import duplimesh
+from object_physics_meadow.duplimesh import project_on_ground
+from object_physics_meadow.util import *
_blob_object_name = "__MeadowBlob__"
@@ -133,7 +133,7 @@ def make_blobs(context, gridob, groundob, samples):
#-----------------------------------------------------------------------
-from meadow.patch import patch_objects
+from object_physics_meadow.patch import patch_objects
def setup_blob_duplis(context):
# build patch map for lookup
diff --git a/object_physics_meadow/dupliparticle.py b/object_physics_meadow/dupliparticle.py
index 72cfe61..36b6c1a 100644
--- a/object_physics_meadow/dupliparticle.py
+++ b/object_physics_meadow/dupliparticle.py
@@ -21,7 +21,7 @@
import bpy
from mathutils import *
-from meadow.pointcache import OCacheFrame, ParticleTimes, BoidData
+from object_physics_meadow.pointcache import OCacheFrame, ParticleTimes, BoidData
def write_cache(cachedir, filename, locations):
totpoint = len(locations)
diff --git a/object_physics_meadow/hierarchical_dart_throw.py b/object_physics_meadow/hierarchical_dart_throw.py
index 5451169..834f002 100644
--- a/object_physics_meadow/hierarchical_dart_throw.py
+++ b/object_physics_meadow/hierarchical_dart_throw.py
@@ -22,7 +22,7 @@ import random, time
import bpy
from math import *
-from meadow.util import Profiling
+from object_physics_meadow.util import Profiling
# Implements Poisson Disk sampling according to
# "Poisson Disk Point Sets by Hierarchical Dart Throwing"
diff --git a/object_physics_meadow/meadow.py b/object_physics_meadow/meadow.py
index 8a5a69b..b4a0504 100644
--- a/object_physics_meadow/meadow.py
+++ b/object_physics_meadow/meadow.py
@@ -21,14 +21,14 @@
import bpy, os
from mathutils import *
-from meadow import settings as _settings
-from meadow import patch, blob
-from meadow.duplimesh import project_on_ground
-#from meadow import dupliparticle
-#from meadow.pointcache import cache_filename
+from object_physics_meadow import settings as _settings
+from object_physics_meadow import patch, blob
+from object_physics_meadow.duplimesh import project_on_ground
+#from object_physics_meadow import dupliparticle
+#from object_physics_meadow.pointcache import cache_filename
-from meadow.best_candidate import best_candidate_gen
-from meadow.hierarchical_dart_throw import hierarchical_dart_throw_gen, MeshDebug
+from object_physics_meadow.best_candidate import best_candidate_gen
+from object_physics_meadow.hierarchical_dart_throw import hierarchical_dart_throw_gen, MeshDebug
def make_samples(context, groundob):
settings = _settings.get(context)
diff --git a/object_physics_meadow/patch.py b/object_physics_meadow/patch.py
index 675cc2a..06e9c45 100644
--- a/object_physics_meadow/patch.py
+++ b/object_physics_meadow/patch.py
@@ -22,8 +22,8 @@ import bpy, time, sys
from mathutils import *
from bpy_extras import object_utils
-from meadow import settings as _settings
-from meadow.util import *
+from object_physics_meadow import settings as _settings
+from object_physics_meadow.util import *
# supported relation types between patch objects
# yields (data, property) pairs to object pointer properties
diff --git a/object_physics_meadow/settings.py b/object_physics_meadow/settings.py
index 404d0f8..d3d15d1 100644
--- a/object_physics_meadow/settings.py
+++ b/object_physics_meadow/settings.py
@@ -30,7 +30,7 @@ def copy_rna_enum_items(type, prop):
dupli_draw_type_items = copy_rna_enum_items(bpy.types.Object, 'draw_type')
def dupli_draw_type_update(self, context):
- from meadow import blob # import here to avoid cyclic import
+ from object_physics_meadow import blob # import here to avoid cyclic import
for ob in blob.blob_objects(context):
blob.blob_apply_settings(ob, self)
diff --git a/object_physics_meadow/ui.py b/object_physics_meadow/ui.py
index b38845d..a53c747 100644
--- a/object_physics_meadow/ui.py
+++ b/object_physics_meadow/ui.py
@@ -22,7 +22,7 @@ import bpy, os
from bpy.types import Operator, Panel
from bpy.props import *
-from meadow import meadow, settings as _settings, patch, blob
+from object_physics_meadow import meadow, settings as _settings, patch, blob
class OBJECT_PT_Meadow(Panel):
"""Settings for meadow components"""
More information about the Bf-extensions-cvs
mailing list