Skip to content

Commit

Permalink
rename export/particles.py to export/hair.py
Browse files Browse the repository at this point in the history
  • Loading branch information
Theverat committed Feb 15, 2018
1 parent f229089 commit 211981a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions export/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .. import utils
from . import (
blender_object, caches, camera, config, duplis,
imagepipeline, light, material, motion_blur, particle, world
imagepipeline, light, material, motion_blur, hair, world
)
from .light import WORLD_BACKGROUND_LIGHT_NAME

Expand Down Expand Up @@ -253,7 +253,7 @@ def _convert_object(self, props, obj, scene, context, luxcore_scene,
settings = psys.settings
# render_type OBJECT and GROUP are handled by duplis.convert() above
if settings.type == "HAIR" and settings.render_type == "PATH":
particle.convert_hair(obj, psys, luxcore_scene, scene, context, engine)
hair.convert_hair(obj, psys, luxcore_scene, scene, context, engine)

if exported_obj is None:
# Object is not visible or an error happened.
Expand Down
5 changes: 4 additions & 1 deletion export/duplis.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ def add(self, matrix):


def convert(blender_obj, scene, context, luxcore_scene, engine=None):
"""
Converts particle systems and dupliverts/faces (everything apart from hair)
"""
try:
assert blender_obj.is_duplicator

Expand Down Expand Up @@ -105,7 +108,7 @@ def convert(blender_obj, scene, context, luxcore_scene, engine=None):

print("Dupli export took %.3fs" % (time() - start))
except Exception as error:
msg = "[%s] %s" % (blender_obj.name, error)
msg = '[Duplicator "%s"] %s' % (blender_obj.name, error)
scene.luxcore.errorlog.add_warning(msg)
import traceback
traceback.print_exc()
File renamed without changes.

0 comments on commit 211981a

Please sign in to comment.