[SCM] yafaray-blender2.5-exporter/master: Imported Upstream version 0.1.2~beta2.2
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Sun Nov 6 08:36:03 UTC 2011
The following commit has been merged in the master branch:
commit 987c5a17f9dcf02354f269eab39b1d3365bf5b21
Author: Matteo F. Vescovi <m.vescovi at revese.it>
Date: Sat Nov 5 18:30:02 2011 +0100
Imported Upstream version 0.1.2~beta2.2
diff --git a/ot/yafaray_operators.py b/ot/yafaray_operators.py
index 74319d2..f58efeb 100644
--- a/ot/yafaray_operators.py
+++ b/ot/yafaray_operators.py
@@ -19,11 +19,10 @@
import bpy
import math
import mathutils
-from bpy.types import Operator
from bpy.props import FloatProperty, StringProperty
-class OBJECT_OT_get_position(Operator):
+class OBJECT_OT_get_position(bpy.types.Operator):
bl_label = "From( get position )"
bl_idname = "world.get_position"
bl_description = "Get position from selected sun lamp"
@@ -37,7 +36,7 @@ class OBJECT_OT_get_position(Operator):
return{'FINISHED'}
-class OBJECT_OT_get_angle(Operator):
+class OBJECT_OT_get_angle(bpy.types.Operator):
bl_label = "From( get angle )"
bl_idname = "world.get_angle"
bl_description = "Get angle from selected sun lamp"
@@ -51,7 +50,7 @@ class OBJECT_OT_get_angle(Operator):
return{'FINISHED'}
-class OBJECT_OT_update_sun(Operator):
+class OBJECT_OT_update_sun(bpy.types.Operator):
bl_label = "From( update sun )"
bl_idname = "world.update_sun"
bl_description = "Update position and angle of selected sun lamp according to GUI values"
@@ -147,7 +146,7 @@ def checkSceneLights():
return sceneLights
-class RENDER_OT_render_view(Operator):
+class RENDER_OT_render_view(bpy.types.Operator):
bl_label = "YafaRay render view"
bl_idname = "render.render_view"
bl_description = "Renders using the view in the active 3d viewport"
@@ -192,7 +191,7 @@ class RENDER_OT_render_view(Operator):
return {'FINISHED'}
-class RENDER_OT_render_animation(Operator):
+class RENDER_OT_render_animation(bpy.types.Operator):
bl_label = "YafaRay render animation"
bl_idname = "render.render_animation"
bl_description = "Render active scene"
@@ -221,7 +220,7 @@ class RENDER_OT_render_animation(Operator):
return {'FINISHED'}
-class RENDER_OT_render_still(Operator):
+class RENDER_OT_render_still(bpy.types.Operator):
bl_label = "YafaRay render still"
bl_idname = "render.render_still"
bl_description = "Render active scene"
@@ -253,7 +252,7 @@ class RENDER_OT_render_still(Operator):
return {'FINISHED'}
-class YAF_OT_presets_ior_list(Operator):
+class YAF_OT_presets_ior_list(bpy.types.Operator):
bl_idname = "material.set_ior_preset"
bl_label = "IOR presets"
index = bpy.props.FloatProperty()
diff --git a/ot/yafaray_presets.py b/ot/yafaray_presets.py
index 8b342d1..21178ac 100644
--- a/ot/yafaray_presets.py
+++ b/ot/yafaray_presets.py
@@ -17,7 +17,6 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
-from bpy.types import Operator
import os
import sys
from bpy.path import clean_name, display_name
@@ -137,7 +136,7 @@ class YAF_AddPresetBase():
return self.execute(context)
-class YAFARAY_OT_presets_renderset(YAF_AddPresetBase, Operator):
+class YAFARAY_OT_presets_renderset(YAF_AddPresetBase, bpy.types.Operator):
'''Add a Yafaray Render Preset'''
bl_idname = "yafaray.preset_add"
bl_label = "Yafaray Render Presets"
diff --git a/ui/__init__.py b/ui/__init__.py
index f8cdcec..e70856b 100644
--- a/ui/__init__.py
+++ b/ui/__init__.py
@@ -51,12 +51,3 @@ for member in dir(properties_data_mesh): # add all "object data" panels from bl
except:
pass
del properties_data_mesh
-
-from bl_ui import properties_data_speaker as properties_data_speaker
-for member in dir(properties_data_speaker): # add all "speaker (SOC 2011, pepper branch)" panels from blender
- subclass = getattr(properties_data_speaker, member)
- try:
- subclass.COMPAT_ENGINES.add('YAFA_RENDER')
- except:
- pass
-del properties_data_speaker
diff --git a/ui/properties_yaf_AA_settings.py b/ui/properties_yaf_AA_settings.py
index 6dade62..f594859 100644
--- a/ui/properties_yaf_AA_settings.py
+++ b/ui/properties_yaf_AA_settings.py
@@ -17,13 +17,12 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
-from bpy.types import Panel
from bl_ui.properties_render import RenderButtonsPanel
RenderButtonsPanel.COMPAT_ENGINES = {'YAFA_RENDER'}
-class YAF_PT_AA_settings(RenderButtonsPanel, Panel):
+class YAF_PT_AA_settings(RenderButtonsPanel, bpy.types.Panel):
bl_label = "Anti-Aliasing Settings"
def draw(self, context):
diff --git a/ui/properties_yaf_camera.py b/ui/properties_yaf_camera.py
index e1091da..39d07be 100644
--- a/ui/properties_yaf_camera.py
+++ b/ui/properties_yaf_camera.py
@@ -17,13 +17,12 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
-from bpy.types import Panel
from bl_ui.properties_data_camera import CameraButtonsPanel
CameraButtonsPanel.COMPAT_ENGINES = {'YAFA_RENDER'}
-class YAF_PT_camera(CameraButtonsPanel, Panel):
+class YAF_PT_camera(CameraButtonsPanel, bpy.types.Panel):
bl_label = "Camera"
def draw(self, context):
@@ -63,7 +62,7 @@ class YAF_PT_camera(CameraButtonsPanel, Panel):
layout.prop(camera, "bokeh_rotation")
-class YAF_PT_camera_display(CameraButtonsPanel, Panel):
+class YAF_PT_camera_display(CameraButtonsPanel, bpy.types.Panel):
bl_label = "Display"
def draw(self, context):
diff --git a/ui/properties_yaf_general_settings.py b/ui/properties_yaf_general_settings.py
index 1360041..ec4dcc0 100644
--- a/ui/properties_yaf_general_settings.py
+++ b/ui/properties_yaf_general_settings.py
@@ -19,19 +19,18 @@
import bpy
from ..ot import yafaray_presets
from bl_ui.properties_render import RenderButtonsPanel
-from bpy.types import Panel, Menu
RenderButtonsPanel.COMPAT_ENGINES = {'YAFA_RENDER'}
-class YAFARAY_MT_presets_render(Menu):
+class YAFARAY_MT_presets_render(bpy.types.Menu):
bl_label = "Yafaray Render Presets"
preset_subdir = "render"
preset_operator = "script.execute_preset"
draw = yafaray_presets.Yafaray_Menu.draw_preset
-class YAF_PT_general_settings(RenderButtonsPanel, Panel):
+class YAF_PT_general_settings(RenderButtonsPanel, bpy.types.Panel):
bl_label = "General Settings"
def draw(self, context):
diff --git a/ui/properties_yaf_integrator.py b/ui/properties_yaf_integrator.py
index 1772377..d95bde9 100644
--- a/ui/properties_yaf_integrator.py
+++ b/ui/properties_yaf_integrator.py
@@ -17,13 +17,12 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
-from bpy.types import Panel
from bl_ui.properties_render import RenderButtonsPanel
RenderButtonsPanel.COMPAT_ENGINES = {'YAFA_RENDER'}
-class YAF_PT_render(RenderButtonsPanel, Panel):
+class YAF_PT_render(RenderButtonsPanel, bpy.types.Panel):
bl_label = "Yafaray Integrator"
def draw(self, context):
diff --git a/ui/properties_yaf_light.py b/ui/properties_yaf_light.py
index d446bcc..31f14d5 100644
--- a/ui/properties_yaf_light.py
+++ b/ui/properties_yaf_light.py
@@ -17,7 +17,6 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
-from bpy.types import Panel
class LampButtonsPanel():
@@ -34,7 +33,7 @@ class LampButtonsPanel():
return lamp and ((lamp.lamp_type == cls.lamp_type) and (lamp.type == switchLampType.get(lamp.lamp_type, None)) and (engine in cls.COMPAT_ENGINES))
-class YAF_PT_preview(Panel):
+class YAF_PT_preview(bpy.types.Panel):
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
bl_context = "data"
@@ -50,7 +49,7 @@ class YAF_PT_preview(Panel):
self.layout.template_preview(context.lamp)
-class YAF_PT_lamp_type(Panel):
+class YAF_PT_lamp_type(bpy.types.Panel):
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
bl_context = "data"
@@ -69,7 +68,7 @@ class YAF_PT_lamp_type(Panel):
layout.prop(lamp, "lamp_type", expand=True)
-class YAF_PT_lamp_area(LampButtonsPanel, Panel):
+class YAF_PT_lamp_area(LampButtonsPanel, bpy.types.Panel):
bl_label = "Area lamp settings"
lamp_type = 'area'
@@ -83,7 +82,7 @@ class YAF_PT_lamp_area(LampButtonsPanel, Panel):
layout.prop(lamp, "create_geometry")
-class YAF_PT_lamp_spot(LampButtonsPanel, Panel):
+class YAF_PT_lamp_spot(LampButtonsPanel, bpy.types.Panel):
bl_label = "Spot lamp settings"
lamp_type = 'spot'
@@ -103,7 +102,7 @@ class YAF_PT_lamp_spot(LampButtonsPanel, Panel):
layout.prop(lamp, "photon_only")
-class YAF_PT_spotshape(LampButtonsPanel, Panel):
+class YAF_PT_spotshape(LampButtonsPanel, bpy.types.Panel):
bl_label = "Spot shape settings"
lamp_type = 'spot'
@@ -122,7 +121,7 @@ class YAF_PT_spotshape(LampButtonsPanel, Panel):
col.prop(lamp, "spot_blend", text="Blend", slider=True)
-class YAF_PT_lamp_sun(LampButtonsPanel, Panel):
+class YAF_PT_lamp_sun(LampButtonsPanel, bpy.types.Panel):
bl_label = "Sun lamp settings"
lamp_type = 'sun'
@@ -141,7 +140,7 @@ class YAF_PT_lamp_sun(LampButtonsPanel, Panel):
box.prop(lamp, "infinite")
-class YAF_PT_lamp_point(LampButtonsPanel, Panel):
+class YAF_PT_lamp_point(LampButtonsPanel, bpy.types.Panel):
bl_label = "Point lamp settings"
lamp_type = 'point'
@@ -160,7 +159,7 @@ class YAF_PT_lamp_point(LampButtonsPanel, Panel):
box.prop(lamp, "create_geometry")
-class YAF_PT_lamp_ies(LampButtonsPanel, Panel):
+class YAF_PT_lamp_ies(LampButtonsPanel, bpy.types.Panel):
bl_label = "IES lamp settings"
lamp_type = 'ies'
diff --git a/ui/properties_yaf_material.py b/ui/properties_yaf_material.py
index b1fe859..5e94beb 100644
--- a/ui/properties_yaf_material.py
+++ b/ui/properties_yaf_material.py
@@ -18,7 +18,6 @@
import bpy
from .ior_values import ior_list
-from bpy.types import Panel, Menu
from bl_ui.properties_material import (MATERIAL_MT_specials,
MaterialButtonsPanel,
active_node_mat,
@@ -37,7 +36,7 @@ class MaterialTypePanel(MaterialButtonsPanel):
return check_material(yaf_mat) and (yaf_mat.mat_type in cls.material_type) and (engine in cls.COMPAT_ENGINES)
-class YAF_PT_context_material(MaterialButtonsPanel, Panel):
+class YAF_PT_context_material(MaterialButtonsPanel, bpy.types.Panel):
bl_label = ""
bl_options = {'HIDE_HEADER'}
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -94,7 +93,7 @@ class YAF_PT_context_material(MaterialButtonsPanel, Panel):
layout.prop(yaf_mat, "mat_type")
-class YAF_MATERIAL_PT_preview(MaterialButtonsPanel, Panel):
+class YAF_MATERIAL_PT_preview(MaterialButtonsPanel, bpy.types.Panel):
bl_label = "Preview"
def draw(self, context):
@@ -118,7 +117,7 @@ for ior_group, ior_n in ior_list:
submenu_idname = 'YAF_MT_presets_ior_list_cat%d' % len(submenus)
submenu = type(
submenu_idname,
- (Menu,),
+ (bpy.types.Menu,),
{
'bl_idname': submenu_idname,
'bl_label': ior_group,
@@ -129,7 +128,7 @@ for ior_group, ior_n in ior_list:
submenus.append(submenu)
-class YAF_MT_presets_ior_list(Menu):
+class YAF_MT_presets_ior_list(bpy.types.Menu):
bl_label = "Glass"
def draw(self, context):
@@ -138,7 +137,7 @@ class YAF_MT_presets_ior_list(Menu):
sl.menu(sm.bl_idname)
-class YAF_PT_shinydiffuse_diffuse(MaterialTypePanel, Panel):
+class YAF_PT_shinydiffuse_diffuse(MaterialTypePanel, bpy.types.Panel):
bl_label = "Diffuse reflection"
material_type = 'shinydiffusemat'
@@ -172,7 +171,7 @@ class YAF_PT_shinydiffuse_diffuse(MaterialTypePanel, Panel):
box.row().prop(yaf_mat, "transmit_filter", slider=True)
-class YAF_PT_shinydiffuse_specular(MaterialTypePanel, Panel):
+class YAF_PT_shinydiffuse_specular(MaterialTypePanel, bpy.types.Panel):
bl_label = "Specular reflection"
material_type = 'shinydiffusemat'
@@ -193,7 +192,7 @@ class YAF_PT_shinydiffuse_specular(MaterialTypePanel, Panel):
layout.row().prop(yaf_mat, "specular_reflect", slider=True)
-class YAF_PT_glossy_diffuse(MaterialTypePanel, Panel):
+class YAF_PT_glossy_diffuse(MaterialTypePanel, bpy.types.Panel):
bl_label = "Diffuse reflection"
material_type = 'glossy', 'coated_glossy'
@@ -215,7 +214,7 @@ class YAF_PT_glossy_diffuse(MaterialTypePanel, Panel):
layout.row().prop(yaf_mat, "diffuse_reflect", slider=True)
-class YAF_PT_glossy_specular(MaterialTypePanel, Panel):
+class YAF_PT_glossy_specular(MaterialTypePanel, bpy.types.Panel):
bl_label = "Specular reflection"
material_type = 'glossy', 'coated_glossy'
@@ -254,7 +253,7 @@ class YAF_PT_glossy_specular(MaterialTypePanel, Panel):
col.label()
-class YAF_PT_glass_real(MaterialTypePanel, Panel):
+class YAF_PT_glass_real(MaterialTypePanel, bpy.types.Panel):
bl_label = "Real glass settings"
material_type = 'glass', 'rough_glass'
@@ -285,7 +284,7 @@ class YAF_PT_glass_real(MaterialTypePanel, Panel):
box.row().prop(yaf_mat, "refr_roughness", slider=True)
-class YAF_PT_glass_fake(MaterialTypePanel, Panel):
+class YAF_PT_glass_fake(MaterialTypePanel, bpy.types.Panel):
bl_label = "Fake glass settings"
material_type = 'glass', 'rough_glass'
@@ -302,7 +301,7 @@ class YAF_PT_glass_fake(MaterialTypePanel, Panel):
layout.row().prop(yaf_mat, "fake_shadows")
-class YAF_PT_blend_(MaterialTypePanel, Panel):
+class YAF_PT_blend_(MaterialTypePanel, bpy.types.Panel):
bl_label = "Blend material settings"
material_type = 'blend'
diff --git a/ui/properties_yaf_object.py b/ui/properties_yaf_object.py
index a927a0a..8fce986 100644
--- a/ui/properties_yaf_object.py
+++ b/ui/properties_yaf_object.py
@@ -17,10 +17,9 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
-from bpy.types import Panel
-class YAF_PT_object_light(Panel):
+class YAF_PT_object_light(bpy.types.Panel):
bl_label = "YafaRay Object Properties"
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
diff --git a/ui/properties_yaf_render.py b/ui/properties_yaf_render.py
index 813e4a0..81bd50a 100644
--- a/ui/properties_yaf_render.py
+++ b/ui/properties_yaf_render.py
@@ -17,13 +17,12 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
-from bpy.types import Panel
from bl_ui.properties_render import RenderButtonsPanel
RenderButtonsPanel.COMPAT_ENGINES = {'YAFA_RENDER'}
-class YAFRENDER_PT_render(RenderButtonsPanel, Panel):
+class YAFRENDER_PT_render(RenderButtonsPanel, bpy.types.Panel):
bl_label = "Render"
def draw(self, context):
@@ -38,7 +37,7 @@ class YAFRENDER_PT_render(RenderButtonsPanel, Panel):
layout.prop(rd, "display_mode", text="Display")
-class YAFRENDER_PT_dimensions(RenderButtonsPanel, Panel):
+class YAFRENDER_PT_dimensions(RenderButtonsPanel, bpy.types.Panel):
bl_label = "Dimensions"
bl_options = {'DEFAULT_CLOSED'}
@@ -77,7 +76,7 @@ from . import properties_yaf_integrator
from . import properties_yaf_AA_settings
-class YAFRENDER_PT_output(RenderButtonsPanel, Panel):
+class YAFRENDER_PT_output(RenderButtonsPanel, bpy.types.Panel):
bl_label = "Output Settings"
def draw(self, context):
@@ -95,7 +94,7 @@ class YAFRENDER_PT_output(RenderButtonsPanel, Panel):
col.row().prop(rd, "color_mode", text="Color", expand=True)
-class YAFRENDER_PT_post_processing(RenderButtonsPanel, Panel):
+class YAFRENDER_PT_post_processing(RenderButtonsPanel, bpy.types.Panel):
bl_label = "Post Processing"
bl_options = {'DEFAULT_CLOSED'}
@@ -114,7 +113,7 @@ class YAFRENDER_PT_post_processing(RenderButtonsPanel, Panel):
col.prop(rd, "dither_intensity", text="Dither", slider=True)
-class YAF_PT_convert(RenderButtonsPanel, Panel):
+class YAF_PT_convert(RenderButtonsPanel, bpy.types.Panel):
bl_label = "Convert old YafaRay Settings"
def draw(self, context):
diff --git a/ui/properties_yaf_strand.py b/ui/properties_yaf_strand.py
index fa5e3bb..90119c5 100644
--- a/ui/properties_yaf_strand.py
+++ b/ui/properties_yaf_strand.py
@@ -17,10 +17,9 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
-from bpy.types import Panel
-class YAF_PT_strand_settings(Panel):
+class YAF_PT_strand_settings(bpy.types.Panel):
bl_label = "Strand Settings"
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
diff --git a/ui/properties_yaf_texture.py b/ui/properties_yaf_texture.py
index 445d733..3e551da 100644
--- a/ui/properties_yaf_texture.py
+++ b/ui/properties_yaf_texture.py
@@ -19,7 +19,6 @@
import bpy
from bl_ui.properties_material import active_node_mat
from bl_ui.properties_texture import context_tex_datablock
-from bpy.types import Panel
class YAF_TextureButtonsPanel():
@@ -34,7 +33,7 @@ class YAF_TextureButtonsPanel():
return tex and (tex.yaf_tex_type != 'NONE' or tex.use_nodes) and (context.scene.render.engine in cls.COMPAT_ENGINES)
-class YAF_TEXTURE_PT_context_texture(YAF_TextureButtonsPanel, Panel):
+class YAF_TEXTURE_PT_context_texture(YAF_TextureButtonsPanel, bpy.types.Panel):
bl_label = "YafaRay Textures"
bl_options = {'HIDE_HEADER'}
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -107,7 +106,7 @@ class YAF_TEXTURE_PT_context_texture(YAF_TextureButtonsPanel, Panel):
split.prop(tex, "yaf_tex_type", text="")
-class YAF_TEXTURE_PT_preview(YAF_TextureButtonsPanel, Panel):
+class YAF_TEXTURE_PT_preview(YAF_TextureButtonsPanel, bpy.types.Panel):
bl_label = "Preview"
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -146,7 +145,7 @@ class YAF_TextureTypePanel(YAF_TextureButtonsPanel):
return tex and ((tex.yaf_tex_type == cls.tex_type and not tex.use_nodes) and (engine in cls.COMPAT_ENGINES))
-class YAF_TEXTURE_PT_clouds(YAF_TextureTypePanel, Panel):
+class YAF_TEXTURE_PT_clouds(YAF_TextureTypePanel, bpy.types.Panel):
bl_label = "Clouds"
tex_type = 'CLOUDS'
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -168,7 +167,7 @@ class YAF_TEXTURE_PT_clouds(YAF_TextureTypePanel, Panel):
split.prop(tex, "noise_depth", text="Depth")
-class YAF_TEXTURE_PT_wood(YAF_TextureTypePanel, Panel):
+class YAF_TEXTURE_PT_wood(YAF_TextureTypePanel, bpy.types.Panel):
bl_label = "Wood"
tex_type = 'WOOD'
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -195,7 +194,7 @@ class YAF_TEXTURE_PT_wood(YAF_TextureTypePanel, Panel):
split.prop(tex, "turbulence")
-class YAF_TEXTURE_PT_marble(YAF_TextureTypePanel, Panel):
+class YAF_TEXTURE_PT_marble(YAF_TextureTypePanel, bpy.types.Panel):
bl_label = "Marble"
tex_type = 'MARBLE'
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -219,7 +218,7 @@ class YAF_TEXTURE_PT_marble(YAF_TextureTypePanel, Panel):
split.prop(tex, "turbulence")
-class YAF_TEXTURE_PT_blend(YAF_TextureTypePanel, Panel):
+class YAF_TEXTURE_PT_blend(YAF_TextureTypePanel, bpy.types.Panel):
bl_label = "Blend"
tex_type = 'BLEND'
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -235,7 +234,7 @@ class YAF_TEXTURE_PT_blend(YAF_TextureTypePanel, Panel):
layout.label(text=" ")
-class YAF_TEXTURE_PT_image(YAF_TextureTypePanel, Panel):
+class YAF_TEXTURE_PT_image(YAF_TextureTypePanel, bpy.types.Panel):
bl_label = "Map Image"
tex_type = 'IMAGE'
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -247,7 +246,7 @@ class YAF_TEXTURE_PT_image(YAF_TextureTypePanel, Panel):
layout.template_image(tex, "image", tex.image_user)
-class YAF_TEXTURE_PT_image_sampling(YAF_TextureTypePanel, Panel):
+class YAF_TEXTURE_PT_image_sampling(YAF_TextureTypePanel, bpy.types.Panel):
bl_label = "Image Sampling"
bl_options = {'DEFAULT_CLOSED'}
tex_type = 'IMAGE'
@@ -263,7 +262,7 @@ class YAF_TEXTURE_PT_image_sampling(YAF_TextureTypePanel, Panel):
layout.prop(tex, "use_flip_axis", text="Flip X/Y Axis")
-class YAF_TEXTURE_PT_image_mapping(YAF_TextureTypePanel, Panel):
+class YAF_TEXTURE_PT_image_mapping(YAF_TextureTypePanel, bpy.types.Panel):
bl_label = "Image Mapping"
bl_options = {'DEFAULT_CLOSED'}
tex_type = 'IMAGE'
@@ -309,7 +308,7 @@ class YAF_TEXTURE_PT_image_mapping(YAF_TextureTypePanel, Panel):
col.prop(tex, "crop_max_y", text="Y")
-class YAF_TEXTURE_PT_musgrave(YAF_TextureTypePanel, Panel):
+class YAF_TEXTURE_PT_musgrave(YAF_TextureTypePanel, bpy.types.Panel):
bl_label = "Musgrave"
tex_type = 'MUSGRAVE'
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -345,7 +344,7 @@ class YAF_TEXTURE_PT_musgrave(YAF_TextureTypePanel, Panel):
row.prop(tex, "noise_scale", text="Size")
-class YAF_TEXTURE_PT_voronoi(YAF_TextureTypePanel, Panel):
+class YAF_TEXTURE_PT_voronoi(YAF_TextureTypePanel, bpy.types.Panel):
bl_label = "Voronoi"
tex_type = 'VORONOI'
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -380,7 +379,7 @@ class YAF_TEXTURE_PT_voronoi(YAF_TextureTypePanel, Panel):
row.prop(tex, "noise_scale", text="Size")
-class YAF_TEXTURE_PT_distortednoise(YAF_TextureTypePanel, Panel):
+class YAF_TEXTURE_PT_distortednoise(YAF_TextureTypePanel, bpy.types.Panel):
bl_label = "Distorted Noise"
tex_type = 'DISTORTED_NOISE'
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -400,7 +399,7 @@ class YAF_TEXTURE_PT_distortednoise(YAF_TextureTypePanel, Panel):
split.prop(tex, "noise_scale", text="Size")
-class YAF_TEXTURE_PT_mapping(YAF_TextureSlotPanel, Panel):
+class YAF_TEXTURE_PT_mapping(YAF_TextureSlotPanel, bpy.types.Panel):
bl_label = "YafaRay Mapping (Map Input)"
COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -484,7 +483,7 @@ class YAF_TEXTURE_PT_mapping(YAF_TextureSlotPanel, Panel):
row.column().prop(tex, "scale")
-class YAF_TEXTURE_PT_influence(YAF_TextureSlotPanel, Panel):
+class YAF_TEXTURE_PT_influence(YAF_TextureSlotPanel, bpy.types.Panel):
bl_label = "YafaRay Influence (Map To)"
COMPAT_ENGINES = {'YAFA_RENDER'}
diff --git a/ui/properties_yaf_volume_integrator.py b/ui/properties_yaf_volume_integrator.py
index 8ab3e94..e75e54e 100644
--- a/ui/properties_yaf_volume_integrator.py
+++ b/ui/properties_yaf_volume_integrator.py
@@ -17,13 +17,12 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
-from bpy.types import Panel
from bl_ui.properties_world import WorldButtonsPanel
WorldButtonsPanel.COMPAT_ENGINES = {'YAFA_RENDER'}
-class YAF_PT_vol_integrator(WorldButtonsPanel, Panel):
+class YAF_PT_vol_integrator(WorldButtonsPanel, bpy.types.Panel):
bl_label = "YafaRay Volume Integrator"
def draw(self, context):
diff --git a/ui/properties_yaf_world.py b/ui/properties_yaf_world.py
index 7bf0c19..5bc8ac7 100644
--- a/ui/properties_yaf_world.py
+++ b/ui/properties_yaf_world.py
@@ -17,7 +17,6 @@
# ##### END GPL LICENSE BLOCK #####
import bpy
-from bpy.types import Panel
from bl_ui.properties_world import WorldButtonsPanel
WorldButtonsPanel.COMPAT_ENGINES = {'YAFA_RENDER'}
@@ -27,7 +26,7 @@ WORLD_PT_preview.COMPAT_ENGINES.add('YAFA_RENDER')
del WORLD_PT_preview
-class YAFWORLD_PT_world(WorldButtonsPanel, Panel):
+class YAFWORLD_PT_world(WorldButtonsPanel, bpy.types.Panel):
bl_label = "Background Settings"
ibl = True
--
yafaray-blender2.5-exporter packaging
More information about the pkg-multimedia-commits
mailing list