[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52959] trunk/blender/intern/cycles/ blender: Cycles: shuffle addon import statements a bit to try to fix a strange import
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Dec 13 09:46:00 CET 2012
Revision: 52959
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52959
Author: blendix
Date: 2012-12-13 08:45:55 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
Cycles: shuffle addon import statements a bit to try to fix a strange import
error in some builds.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/CMakeLists.txt
trunk/blender/intern/cycles/blender/addon/__init__.py
trunk/blender/intern/cycles/blender/addon/engine.py
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/intern/cycles/blender/addon/ui.py
Removed Paths:
-------------
trunk/blender/intern/cycles/blender/addon/enums.py
Modified: trunk/blender/intern/cycles/blender/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/blender/CMakeLists.txt 2012-12-13 07:32:31 UTC (rev 52958)
+++ trunk/blender/intern/cycles/blender/CMakeLists.txt 2012-12-13 08:45:55 UTC (rev 52959)
@@ -38,7 +38,6 @@
set(ADDON_FILES
addon/__init__.py
addon/engine.py
- addon/enums.py
addon/osl.py
addon/presets.py
addon/properties.py
Modified: trunk/blender/intern/cycles/blender/addon/__init__.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/__init__.py 2012-12-13 07:32:31 UTC (rev 52958)
+++ trunk/blender/intern/cycles/blender/addon/__init__.py 2012-12-13 08:45:55 UTC (rev 52959)
@@ -21,7 +21,7 @@
bl_info = {
"name": "Cycles Render Engine",
"author": "",
- "blender": (2, 6, 3),
+ "blender": (2, 6, 5),
"location": "Info header, render engine menu",
"description": "Cycles Render Engine integration",
"warning": "",
@@ -31,8 +31,8 @@
"category": "Render"}
import bpy
-from . import ui, properties, engine, presets
+from . import engine
class CyclesRender(bpy.types.RenderEngine):
bl_idname = 'CYCLES'
@@ -84,6 +84,10 @@
def register():
+ from . import ui
+ from . import properties
+ from . import presets
+
properties.register()
ui.register()
presets.register()
@@ -91,6 +95,10 @@
def unregister():
+ from . import ui
+ from . import properties
+ from . import presets
+
ui.unregister()
properties.unregister()
presets.unregister()
Modified: trunk/blender/intern/cycles/blender/addon/engine.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/engine.py 2012-12-13 07:32:31 UTC (rev 52958)
+++ trunk/blender/intern/cycles/blender/addon/engine.py 2012-12-13 08:45:55 UTC (rev 52959)
@@ -18,10 +18,8 @@
# <pep8 compliant>
-import bpy
-
-
def init():
+ import bpy
import _cycles
import os.path
@@ -32,6 +30,7 @@
def create(engine, data, scene, region=0, v3d=0, rv3d=0):
+ import bpy
import _cycles
data = data.as_pointer()
Deleted: trunk/blender/intern/cycles/blender/addon/enums.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/enums.py 2012-12-13 07:32:31 UTC (rev 52958)
+++ trunk/blender/intern/cycles/blender/addon/enums.py 2012-12-13 08:45:55 UTC (rev 52959)
@@ -1,63 +0,0 @@
-#
-# Copyright 2011, Blender Foundation.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-
-# <pep8 compliant>
-
-from . import engine
-
-devices = (
- ('CPU', "CPU", "Use CPU for rendering"),
- ('GPU', "GPU Compute", "Use GPU compute device for rendering, configured in user preferences"))
-
-feature_set = (
- ('SUPPORTED', "Supported", "Only use finished and supported features"),
- ('EXPERIMENTAL', "Experimental", "Use experimental and incomplete features that might be broken or change in the future"),
- )
-
-shading_systems = (
- ('GPU_COMPATIBLE', "GPU Compatible", "Restricted shading system compatible with GPU rendering"),
- ('OSL', "Open Shading Language", "Open Shading Language shading system that only runs on the CPU"),
- )
-
-displacement_methods = (
- ('BUMP', "Bump", "Bump mapping to simulate the appearance of displacement"),
- ('TRUE', "True", "Use true displacement only, requires fine subdivision"),
- ('BOTH', "Both", "Combination of displacement and bump mapping"),
- )
-
-bvh_types = (
- ('DYNAMIC_BVH', "Dynamic BVH", "Objects can be individually updated, at the cost of slower render time"),
- ('STATIC_BVH', "Static BVH", "Any object modification requires a complete BVH rebuild, but renders faster"),
- )
-
-filter_types = (
- ('BOX', "Box", "Box filter"),
- ('GAUSSIAN', "Gaussian", "Gaussian filter"),
- )
-
-aperture_types = (
- ('RADIUS', "Radius", "Directly change the size of the aperture"),
- ('FSTOP', "F/stop", "Change the size of the aperture by f/stops"),
- )
-
-panorama_types = (
- ('EQUIRECTANGULAR', "Equirectangular", "Render the scene with a spherical camera, also known as Lat Long panorama"),
- ('FISHEYE_EQUIDISTANT', "Fisheye Equidistant", "Ideal for fulldomes, ignore the sensor dimensions"),
- ('FISHEYE_EQUISOLID', "Fisheye Equisolid",
- "Similar to most fisheye modern lens, takes sensor dimensions into consideration"),
- )
Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py 2012-12-13 07:32:31 UTC (rev 52958)
+++ trunk/blender/intern/cycles/blender/addon/properties.py 2012-12-13 08:45:55 UTC (rev 52959)
@@ -25,11 +25,50 @@
IntProperty,
PointerProperty)
-import math
+# enums
-from . import enums
+enum_devices = (
+ ('CPU', "CPU", "Use CPU for rendering"),
+ ('GPU', "GPU Compute", "Use GPU compute device for rendering, configured in user preferences"))
+enum_feature_set = (
+ ('SUPPORTED', "Supported", "Only use finished and supported features"),
+ ('EXPERIMENTAL', "Experimental", "Use experimental and incomplete features that might be broken or change in the future"),
+ )
+enum_shading_systems = (
+ ('GPU_COMPATIBLE', "GPU Compatible", "Restricted shading system compatible with GPU rendering"),
+ ('OSL', "Open Shading Language", "Open Shading Language shading system that only runs on the CPU"),
+ )
+
+enum_displacement_methods = (
+ ('BUMP', "Bump", "Bump mapping to simulate the appearance of displacement"),
+ ('TRUE', "True", "Use true displacement only, requires fine subdivision"),
+ ('BOTH', "Both", "Combination of displacement and bump mapping"),
+ )
+
+enum_bvh_types = (
+ ('DYNAMIC_BVH', "Dynamic BVH", "Objects can be individually updated, at the cost of slower render time"),
+ ('STATIC_BVH', "Static BVH", "Any object modification requires a complete BVH rebuild, but renders faster"),
+ )
+
+enum_filter_types = (
+ ('BOX', "Box", "Box filter"),
+ ('GAUSSIAN', "Gaussian", "Gaussian filter"),
+ )
+
+enum_aperture_types = (
+ ('RADIUS', "Radius", "Directly change the size of the aperture"),
+ ('FSTOP', "F/stop", "Change the size of the aperture by f/stops"),
+ )
+
+enum_panorama_types = (
+ ('EQUIRECTANGULAR', "Equirectangular", "Render the scene with a spherical camera, also known as Lat Long panorama"),
+ ('FISHEYE_EQUIDISTANT', "Fisheye Equidistant", "Ideal for fulldomes, ignore the sensor dimensions"),
+ ('FISHEYE_EQUISOLID', "Fisheye Equisolid",
+ "Similar to most fisheye modern lens, takes sensor dimensions into consideration"),
+ )
+
class CyclesRenderSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
@@ -41,19 +80,19 @@
cls.device = EnumProperty(
name="Device",
description="Device to use for rendering",
- items=enums.devices,
+ items=enum_devices,
default='CPU',
)
cls.feature_set = EnumProperty(
name="Feature Set",
description="Feature set to use for rendering",
- items=enums.feature_set,
+ items=enum_feature_set,
default='SUPPORTED',
)
cls.shading_system = EnumProperty(
name="Shading System",
description="Shading system to use for rendering",
- items=enums.shading_systems,
+ items=enum_shading_systems,
default='GPU_COMPATIBLE',
)
@@ -212,7 +251,7 @@
cls.filter_type = EnumProperty(
name="Filter Type",
description="Pixel filter type",
- items=enums.filter_types,
+ items=enum_filter_types,
default='GAUSSIAN',
)
cls.filter_width = FloatProperty(
@@ -275,7 +314,7 @@
cls.debug_bvh_type = EnumProperty(
name="Viewport BVH Type",
description="Choose between faster updates, or faster render",
- items=enums.bvh_types,
+ items=enum_bvh_types,
default='DYNAMIC_BVH',
)
cls.debug_use_spatial_splits = BoolProperty(
@@ -305,6 +344,8 @@
class CyclesCameraSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
+ import math
+
bpy.types.Camera.cycles = PointerProperty(
name="Cycles Camera Settings",
description="Cycles camera settings",
@@ -314,7 +355,7 @@
cls.aperture_type = EnumProperty(
name="Aperture Type",
description="Use F/stop number or aperture radius",
- items=enums.aperture_types,
+ items=enum_aperture_types,
default='RADIUS',
)
cls.aperture_fstop = FloatProperty(
@@ -349,7 +390,7 @@
cls.panorama_type = EnumProperty(
name="Panorama Type",
description="Distortion to use for the calculation",
- items=enums.panorama_types,
+ items=enum_panorama_types,
default='FISHEYE_EQUISOLID',
)
cls.fisheye_fov = FloatProperty(
@@ -518,7 +559,7 @@
cls.displacement_method = EnumProperty(
name="Displacement Method",
description="Method to use for the displacement",
- items=enums.displacement_methods,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list