[Bf-extensions-cvs] [6d9b302] master: Fix broken addon for 2.7x thanks to TrueCryer

Brendon Murphy noreply at git.blender.org
Mon Jul 21 11:15:16 CEST 2014


Commit: 6d9b302814901198a2c777ade012f4e9f5018de4
Author: Brendon Murphy
Date:   Mon Jul 21 19:14:14 2014 +1000
Branches: master
https://developer.blender.org/rBAC6d9b302814901198a2c777ade012f4e9f5018de4

Fix broken addon for 2.7x thanks to TrueCryer

===================================================================

M	online_mat_lib/__init__.py

===================================================================

diff --git a/online_mat_lib/__init__.py b/online_mat_lib/__init__.py
index 17fb7c2..b917f6f 100644
--- a/online_mat_lib/__init__.py
+++ b/online_mat_lib/__init__.py
@@ -31,15 +31,212 @@ bl_info = {
     "name": "Online Material Library",
     "author": "Peter Cassetta",
     "version": (0, 6),
-    "blender": (2, 64, 0),
+    "blender": (2, 71, 0),
     "location": "Properties > Material > Online Material Library",
-    "description": "Browse and download materials from online CC0 libraries",
+    "description": "Browse and download materials from online CC0 libraries.",
     "warning": "Beta version",
-    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
-        "Scripts/Material/Online_Material_Library",
-    "tracker_url": "https://developer.blender.org/Taid=31802",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Material/Online_Material_Library",
+    "tracker_url": "http://projects.blender.org/tracker/index.php?func=detail&aid=31802",
     "category": "Material"}
 
+node_types = {
+    'SHADER': {
+        'EMISSION': 'ShaderNodeEmission',
+        'HOLDOUT': 'ShaderNodeHoldout',
+        'OUTPUT': 'ShaderNodeOutput',
+        'HAIR_INFO': 'ShaderNodeHairInfo',
+        'ATTRIBUTE': 'ShaderNodeAttribute',
+        'BACKGROUND': 'ShaderNodeBackground',
+        'TEX_VORONOI': 'ShaderNodeTexVoronoi',
+        'OBJECT_INFO': 'ShaderNodeObjectInfo',
+        'MATH': 'ShaderNodeMath',
+        'BSDF_TRANSPARENT': 'ShaderNodeBsdfTransparent',
+        'VALTORGB': 'ShaderNodeValToRGB',
+        'INVERT': 'ShaderNodeInvert',
+        'PARTICLE_INFO': 'ShaderNodeParticleInfo',
+        'BSDF_VELVET': 'ShaderNodeBsdfVelvet',
+        'TEX_MAGIC': 'ShaderNodeTexMagic',
+        'WAVELENGTH': 'ShaderNodeWavelength',
+        'SEPHSV': 'ShaderNodeSeparateHSV',
+        'MIX_SHADER': 'ShaderNodeMixShader',
+        'TEX_GRADIENT': 'ShaderNodeTexGradient',
+        'OUTPUT_WORLD': 'ShaderNodeOutputWorld',
+        'TEX_SKY': 'ShaderNodeTexSky',
+        'SQUEEZE': 'ShaderNodeSqueeze',
+        'LIGHT_PATH': 'ShaderNodeLightPath',
+        'BSDF_TOON': 'ShaderNodeBsdfToon',
+        'TEX_CHECKER': 'ShaderNodeTexChecker',
+        'AMBIENT_OCCLUSION': 'ShaderNodeAmbientOcclusion',
+        'BSDF_GLASS': 'ShaderNodeBsdfGlass',
+        'SEPRGB': 'ShaderNodeSeparateRGB',
+        'MATERIAL': 'ShaderNodeMaterial',
+        'TEX_WAVE': 'ShaderNodeTexWave',
+        'BRIGHTCONTRAST': 'ShaderNodeBrightContrast',
+        'CAMERA': 'ShaderNodeCameraData',
+        'HUE_SAT': 'ShaderNodeHueSaturation',
+        'OUTPUT_LAMP': 'ShaderNodeOutputLamp',
+        'BSDF_DIFFUSE': 'ShaderNodeBsdfDiffuse',
+        'VALUE': 'ShaderNodeValue',
+        'BSDF_ANISOTROPIC': 'ShaderNodeBsdfAnisotropic',
+        'NEW_GEOMETRY': 'ShaderNodeNewGeometry',
+        'MAPPING': 'ShaderNodeMapping',
+        'TEX_IMAGE': 'ShaderNodeTexImage',
+        'LIGHT_FALLOFF': 'ShaderNodeLightFalloff',
+        'COMBRGB': 'ShaderNodeCombineRGB',
+        'GAMMA': 'ShaderNodeGamma',
+        'BLACKBODY': 'ShaderNodeBlackbody',
+        'TEX_COORD': 'ShaderNodeTexCoord',
+        'COMBHSV': 'ShaderNodeCombineHSV',
+        'TEX_BRICK': 'ShaderNodeTexBrick',
+        'BUMP': 'ShaderNodeBump',
+        'SCRIPT': 'ShaderNodeScript',
+        'VECT_MATH': 'ShaderNodeVectorMath',
+        'TEX_NOISE': 'ShaderNodeTexNoise',
+        'CURVE_VEC': 'ShaderNodeVectorCurve',
+        'GEOMETRY': 'ShaderNodeGeometry',
+        'BSDF_TRANSLUCENT': 'ShaderNodeBsdfTranslucent',
+        'CURVE_RGB': 'ShaderNodeRGBCurve',
+        'TEX_ENVIRONMENT': 'ShaderNodeTexEnvironment',
+        'OUTPUT_MATERIAL': 'ShaderNodeOutputMaterial',
+        'BSDF_HAIR': 'ShaderNodeBsdfHair',
+        'RGB': 'ShaderNodeRGB',
+        'WIREFRAME': 'ShaderNodeWireframe',
+        'MIX_RGB': 'ShaderNodeMixRGB',
+        'LAYER_WEIGHT': 'ShaderNodeLayerWeight',
+        'SUBSURFACE_SCATTERING': 'ShaderNodeSubsurfaceScattering',
+        'BSDF_REFRACTION': 'ShaderNodeBsdfRefraction',
+        'NORMAL': 'ShaderNodeNormal',
+        'GROUP': 'ShaderNodeGroup',
+        'FRESNEL': 'ShaderNodeFresnel',
+        'BSDF_GLOSSY': 'ShaderNodeBsdfGlossy',
+        'TANGENT': 'ShaderNodeTangent',
+        'ADD_SHADER': 'ShaderNodeAddShader',
+        'TEXTURE': 'ShaderNodeTexture',
+        'VECT_TRANSFORM': 'ShaderNodeVectorTransform',
+        'MATERIAL_EXT': 'ShaderNodeExtendedMaterial',
+        'TEX_MUSGRAVE': 'ShaderNodeTexMusgrave',
+        'NORMAL_MAP': 'ShaderNodeNormalMap',
+        'RGBTOBW': 'ShaderNodeRGBToBW'},
+    'COMPOSITING': {
+        'KEYING': 'CompositorNodeKeying',
+        'TRANSFORM': 'CompositorNodeTransform',
+        'MAP_VALUE': 'CompositorNodeMapValue',
+        'DESPECKLE': 'CompositorNodeDespeckle',
+        'IMAGE': 'CompositorNodeImage',
+        'SEPHSVA': 'CompositorNodeSepHSVA',
+        'VALUE': 'CompositorNodeValue',
+        'MATH': 'CompositorNodeMath',
+        'COLORCORRECTION': 'CompositorNodeColorCorrection',
+        'VALTORGB': 'CompositorNodeValToRGB',
+        'INVERT': 'CompositorNodeInvert',
+        'ALPHAOVER': 'CompositorNodeAlphaOver',
+        'MIX_RGB': 'CompositorNodeMixRGB',
+        'BOKEHBLUR': 'CompositorNodeBokehBlur',
+        'CHANNEL_MATTE': 'CompositorNodeChannelMatte',
+        'ROTATE': 'CompositorNodeRotate',
+        'DOUBLEEDGEMASK': 'CompositorNodeDoubleEdgeMask',
+        'TRACKPOS': 'CompositorNodeTrackPos',
+        'CROP': 'CompositorNodeCrop',
+        'TEXTURE': 'CompositorNodeTexture',
+        'INPAINT': 'CompositorNodeInpaint',
+        'DISTANCE_MATTE': 'CompositorNodeDistanceMatte',
+        'DILATEERODE': 'CompositorNodeDilateErode',
+        'COMPOSITE': 'CompositorNodeComposite',
+        'FLIP': 'CompositorNodeFlip',
+        'SETALPHA': 'CompositorNodeSetAlpha',
+        'DEFOCUS': 'CompositorNodeDefocus',
+        'BRIGHTCONTRAST': 'CompositorNodeBrightContrast',
+        'COMBYCCA': 'CompositorNodeCombYCCA',
+        'HUE_SAT': 'CompositorNodeHueSat',
+        'SEPRGBA': 'CompositorNodeSepRGBA',
+        'SCALE': 'CompositorNodeScale',
+        'CHROMA_MATTE': 'CompositorNodeChromaMatte',
+        'LEVELS': 'CompositorNodeLevels',
+        'COMBYUVA': 'CompositorNodeCombYUVA',
+        'DBLUR': 'CompositorNodeDBlur',
+        'MAP_UV': 'CompositorNodeMapUV',
+        'GAMMA': 'CompositorNodeGamma',
+        'PIXELATE': 'CompositorNodePixelate',
+        'KEYINGSCREEN': 'CompositorNodeKeyingScreen',
+        'TIME': 'CompositorNodeTime',
+        'MOVIECLIP': 'CompositorNodeMovieClip',
+        'OUTPUT_FILE': 'CompositorNodeOutputFile',
+        'BOXMASK': 'CompositorNodeBoxMask',
+        'COMBRGBA': 'CompositorNodeCombRGBA',
+        'MASK': 'CompositorNodeMask',
+        'BLUR': 'CompositorNodeBlur',
+        'SWITCH': 'CompositorNodeSwitch',
+        'CURVE_VEC': 'CompositorNodeCurveVec',
+        'FILTER': 'CompositorNodeFilter',
+        'TONEMAP': 'CompositorNodeTonemap',
+        'VIEWER': 'CompositorNodeViewer',
+        'SEPYCCA': 'CompositorNodeSepYCCA',
+        'ELLIPSEMASK': 'CompositorNodeEllipseMask',
+        'PLANETRACKDEFORM': 'CompositorNodePlaneTrackDeform',
+        'COMBHSVA': 'CompositorNodeCombHSVA',
+        'VECBLUR': 'CompositorNodeVecBlur',
+        'SEPYUVA': 'CompositorNodeSepYUVA',
+        'MAP_RANGE': 'CompositorNodeMapRange',
+        'HUECORRECT': 'CompositorNodeHueCorrect',
+        'STABILIZE2D': 'CompositorNodeStabilize',
+        'COLORBALANCE': 'CompositorNodeColorBalance',
+        'CURVE_RGB': 'CompositorNodeCurveRGB',
+        'TRANSLATE': 'CompositorNodeTranslate',
+        'PREMULKEY': 'CompositorNodePremulKey',
+        'COLOR_MATTE': 'CompositorNodeColorMatte',
+        'DIFF_MATTE': 'CompositorNodeDiffMatte',
+        'LENSDIST': 'CompositorNodeLensdist',
+        'LUMA_MATTE': 'CompositorNodeLumaMatte',
+        'GROUP': 'CompositorNodeGroup',
+        'NORMAL': 'CompositorNodeNormal',
+        'ID_MASK': 'CompositorNodeIDMask',
+        'MOVIEDISTORTION': 'CompositorNodeMovieDistortion',
+        'DISPLACE': 'CompositorNodeDisplace',
+        'SPLITVIEWER': 'CompositorNodeSplitViewer',
+        'BOKEHIMAGE': 'CompositorNodeBokehImage',
+        'COLOR_SPILL': 'CompositorNodeColorSpill',
+        'NORMALIZE': 'CompositorNodeNormalize',
+        'RGB': 'CompositorNodeRGB',
+        'ZCOMBINE': 'CompositorNodeZcombine',
+        'RGBTOBW': 'CompositorNodeRGBToBW',
+        'BILATERALBLUR': 'CompositorNodeBilateralblur',
+        'GLARE': 'CompositorNodeGlare'},
+    'TEXTURE': {
+        'IMAGE': 'TextureNodeImage',
+        'ROTATE': 'TextureNodeRotate',
+        'TEX_VORONOI': 'TextureNodeTexVoronoi',
+        'CURVE_TIME': 'TextureNodeCurveTime',
+        'TEX_DISTNOISE': 'TextureNodeTexDistNoise',
+        'MATH': 'TextureNodeMath',
+        'TEX_NOISE': 'TextureNodeTexNoise',
+        'INVERT': 'TextureNodeInvert',
+        'CHECKER': 'TextureNodeChecker',
+        'VALTONOR': 'TextureNodeValToNor',
+        'TEX_BLEND': 'TextureNodeTexBlend',
+        'TEX_MAGIC': 'TextureNodeTexMagic',
+        'TEX_MUSGRAVE': 'TextureNodeTexMusgrave',
+        'BRICKS': 'TextureNodeBricks',
+        'VALTORGB': 'TextureNodeValToRGB',
+        'AT': 'TextureNodeAt',
+        'MIX_RGB': 'TextureNodeMixRGB',
+        'CURVE_RGB': 'TextureNodeCurveRGB',
+        'TRANSLATE': 'TextureNodeTranslate',
+        'TEXTURE': 'TextureNodeTexture',
+        'TEX_WOOD': 'TextureNodeTexWood',
+        'TEX_MARBLE': 'TextureNodeTexMarble',
+        'GROUP': 'TextureNodeGroup',
+        'HUE_SAT': 'TextureNodeHueSaturation',
+        'TEX_STUCCI': 'TextureNodeTexStucci',
+        'SCALE': 'TextureNodeScale',
+        'DECOMPOSE': 'TextureNodeDecompose',
+        'VIEWER': 'TextureNodeViewer',
+        'OUTPUT': 'TextureNodeOutput',
+        'DISTANCE': 'TextureNodeDistance',
+        'TEX_CLOUDS': 'TextureNodeTexClouds',
+        'COMPOSE': 'TextureNodeCompose',
+        'COORD': 'TextureNodeCoordinates',
+        'RGBTOBW': 'TextureNodeRGBToBW'}
+}
 
 import bpy
 from bpy_extras.io_utils import ExportHelper
@@ -65,7 +262,7 @@ mat_lib_folder = ""
 
 def findLibrary():
     global mat_lib_folder
-
+    
     if os.path.exists(os.path.join(str(bpy.utils.script_path_pref()), "addons", 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list