fix transfomations being applied twice to duplis

LuxCoreRender · Jan 21, 2018 · 06bea7a · 06bea7a
1 parent da1cacc
commit 06bea7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/export/blender_object.py b/export/blender_object.py
@@ -32,7 +32,7 @@ def convert(blender_obj, scene, context, luxcore_scene,
         transformation = utils.matrix_to_list(blender_obj.matrix_world, scene, apply_worldscale=True)
 
         # Instancing just means that we transform the object instead of the mesh
-        if utils.use_instancing(blender_obj, scene, context):
+        if utils.use_instancing(blender_obj, scene, context) or dupli_suffix:
             obj_transform = transformation
             mesh_transform = None
         else:

diff --git a/ui/particle.py b/ui/particle.py
@@ -9,12 +9,14 @@ class LUXCORE_HAIR_PT_hair(ParticleButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):        
         psys = context.particle_system
-        engine = context.scene.render.engine
         if psys is None:
             return False
         if psys.settings is None:
             return False
-        return psys.settings.type == "HAIR" and (engine == "LUXCORE")
+        is_hair = psys.settings.type == "HAIR"
+        is_path = psys.settings.render_type == "PATH"
+        engine = context.scene.render.engine
+        return is_hair and is_path and engine == "LUXCORE"
 
     def draw(self, context):
         layout = self.layout