diff options
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 144 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 2 |
2 files changed, 59 insertions, 87 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 94ed3dd4311..3c9c83fec42 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -383,7 +383,6 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel): sub.prop(cscene, "use_progressive_refine") subsub = sub.column(align=True) - subsub.enabled = not rd.use_border subsub.prop(rd, "use_save_buffers") col = split.column(align=True) @@ -1599,89 +1598,62 @@ def draw_pause(self, context): def get_panels(): - types = bpy.types - panels = [ - "RENDER_PT_render", - "RENDER_PT_output", - "RENDER_PT_encoding", - "RENDER_PT_dimensions", - "RENDER_PT_stamp", - "RENDER_PT_freestyle", - "RENDERLAYER_PT_layers", - "RENDERLAYER_PT_freestyle", - "RENDERLAYER_PT_freestyle_lineset", - "RENDERLAYER_PT_freestyle_linestyle", - "SCENE_PT_scene", - "SCENE_PT_color_management", - "SCENE_PT_custom_props", - "SCENE_PT_audio", - "SCENE_PT_unit", - "SCENE_PT_keying_sets", - "SCENE_PT_keying_set_paths", - "SCENE_PT_physics", - "WORLD_PT_context_world", - "WORLD_PT_custom_props", - "DATA_PT_context_mesh", - "DATA_PT_context_camera", - "DATA_PT_context_lamp", - "DATA_PT_context_speaker", - "DATA_PT_normals", - "DATA_PT_texture_space", - "DATA_PT_curve_texture_space", - "DATA_PT_mball_texture_space", - "DATA_PT_vertex_groups", - "DATA_PT_shape_keys", - "DATA_PT_uv_texture", - "DATA_PT_vertex_colors", - "DATA_PT_camera", - "DATA_PT_camera_display", - "DATA_PT_camera_stereoscopy", - "DATA_PT_camera_safe_areas", - "DATA_PT_lens", - "DATA_PT_speaker", - "DATA_PT_distance", - "DATA_PT_cone", - "DATA_PT_customdata", - "DATA_PT_custom_props_mesh", - "DATA_PT_custom_props_camera", - "DATA_PT_custom_props_lamp", - "DATA_PT_custom_props_speaker", - "DATA_PT_custom_props_arm", - "DATA_PT_custom_props_curve", - "DATA_PT_custom_props_lattice", - "DATA_PT_custom_props_metaball", - "TEXTURE_PT_preview", - "TEXTURE_PT_custom_props", - "TEXTURE_PT_clouds", - "TEXTURE_PT_wood", - "TEXTURE_PT_marble", - "TEXTURE_PT_magic", - "TEXTURE_PT_blend", - "TEXTURE_PT_stucci", - "TEXTURE_PT_image", - "TEXTURE_PT_image_sampling", - "TEXTURE_PT_image_mapping", - "TEXTURE_PT_musgrave", - "TEXTURE_PT_voronoi", - "TEXTURE_PT_distortednoise", - "TEXTURE_PT_voxeldata", - "TEXTURE_PT_pointdensity", - "TEXTURE_PT_pointdensity_turbulence", - "TEXTURE_PT_mapping", - "TEXTURE_PT_ocean", - "TEXTURE_PT_influence", - "TEXTURE_PT_colors", - "SCENE_PT_rigid_body_world", - "SCENE_PT_rigid_body_cache", - "SCENE_PT_rigid_body_field_weights", - "MATERIAL_PT_custom_props", - "MATERIAL_PT_freestyle_line", - "BONE_PT_custom_props", - "OBJECT_PT_custom_props", - ] - - return [getattr(types, p) for p in panels if hasattr(types, p)] - + exclude_panels = { + 'DATA_PT_area', + 'DATA_PT_camera_dof', + 'DATA_PT_falloff_curve', + 'DATA_PT_lamp', + 'DATA_PT_preview', + 'DATA_PT_shadow', + 'DATA_PT_spot', + 'DATA_PT_sunsky', + 'MATERIAL_PT_context_material', + 'MATERIAL_PT_diffuse', + 'MATERIAL_PT_flare', + 'MATERIAL_PT_halo', + 'MATERIAL_PT_mirror', + 'MATERIAL_PT_options', + 'MATERIAL_PT_pipeline', + 'MATERIAL_PT_preview', + 'MATERIAL_PT_shading', + 'MATERIAL_PT_shadow', + 'MATERIAL_PT_specular', + 'MATERIAL_PT_sss', + 'MATERIAL_PT_strand', + 'MATERIAL_PT_transp', + 'MATERIAL_PT_volume_density', + 'MATERIAL_PT_volume_integration', + 'MATERIAL_PT_volume_lighting', + 'MATERIAL_PT_volume_options', + 'MATERIAL_PT_volume_shading', + 'MATERIAL_PT_volume_transp', + 'RENDERLAYER_PT_layer_options', + 'RENDERLAYER_PT_layer_passes', + 'RENDERLAYER_PT_views', + 'RENDER_PT_antialiasing', + 'RENDER_PT_bake', + 'RENDER_PT_motion_blur', + 'RENDER_PT_performance', + 'RENDER_PT_post_processing', + 'RENDER_PT_shading', + 'SCENE_PT_simplify', + 'TEXTURE_PT_context_texture', + 'WORLD_PT_ambient_occlusion', + 'WORLD_PT_environment_lighting', + 'WORLD_PT_gather', + 'WORLD_PT_indirect_lighting', + 'WORLD_PT_mist', + 'WORLD_PT_preview', + 'WORLD_PT_world' + } + + panels = [] + for panel in bpy.types.Panel.__subclasses__(): + if hasattr(panel, 'COMPAT_ENGINES') and 'BLENDER_RENDER' in panel.COMPAT_ENGINES: + if panel.__name__ not in exclude_panels: + panels.append(panel) + + return panels def register(): bpy.types.RENDER_PT_render.append(draw_device) @@ -1690,10 +1662,10 @@ def register(): for panel in get_panels(): panel.COMPAT_ENGINES.add('CYCLES') - def unregister(): bpy.types.RENDER_PT_render.remove(draw_device) bpy.types.VIEW3D_HT_header.remove(draw_pause) for panel in get_panels(): - panel.COMPAT_ENGINES.remove('CYCLES') + if 'CYCLES' in panel.COMPAT_ENGINES: + panel.COMPAT_ENGINES.remove('CYCLES') diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 7ca23f23cb4..64559804ccb 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -440,7 +440,7 @@ static ShaderNode *add_node(Scene *scene, glossy->distribution = CLOSURE_BSDF_MICROFACET_GGX_ID; break; case BL::ShaderNodeBsdfGlossy::distribution_ASHIKHMIN_SHIRLEY: - glossy->distribution = CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID; + glossy->distribution = CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ID; break; case BL::ShaderNodeBsdfGlossy::distribution_MULTI_GGX: glossy->distribution = CLOSURE_BSDF_MICROFACET_MULTI_GGX_ID; |