[Bf-blender-cvs] [8a97b855558] blender2.7: Fix T54504: Cycles wrong backwards compatibility with linked libraries.
Brecht Van Lommel
noreply at git.blender.org
Sun Feb 17 16:21:52 CET 2019
Commit: 8a97b8555587d8241fd79d54c08c1a6ced7acf53
Author: Brecht Van Lommel
Date: Sun Feb 17 12:27:07 2019 +0100
Branches: blender2.7
https://developer.blender.org/rB8a97b8555587d8241fd79d54c08c1a6ced7acf53
Fix T54504: Cycles wrong backwards compatibility with linked libraries.
The code assumed all datablocks were read from .blend files saved with the
same version. This restructures the Cycles versioning code to take into
account libraries.
===================================================================
M intern/cycles/blender/addon/version_update.py
M source/blender/makesrna/intern/rna_ID.c
===================================================================
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index 3a4b13ef9d2..f3d60d62e02 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -22,89 +22,39 @@ import math
from bpy.app.handlers import persistent
-def check_is_new_shading_ntree(node_tree):
- for node in node_tree.nodes:
- # If material has any node with ONLY new shading system
- # compatibility then it's considered a Cycles material
- # and versioning code would need to perform on it.
- #
- # We can not check for whether NEW_SHADING in compatibility
- # because some nodes could have compatibility with both old
- # and new shading system and they can't be used for any
- # decision here.
- if node.shading_compatibility == {'NEW_SHADING'}:
- return True
-
- # If node is only compatible with old shading system
- # then material can not be Cycles material and we
- # can stopiterating nodes now.
- if node.shading_compatibility == {'OLD_SHADING'}:
- return False
- return False
-
-
-def check_is_new_shading_material(material):
- if not material.node_tree:
- return False
- return check_is_new_shading_ntree(material.node_tree)
-
-
-def check_is_new_shading_world(world):
- if not world.node_tree:
- return False
- return check_is_new_shading_ntree(world.node_tree)
-
-
-def check_is_new_shading_lamp(lamp):
- if not lamp.node_tree:
- return False
- return check_is_new_shading_ntree(lamp.node_tree)
-
-
-def foreach_notree_node(nodetree, callback, traversed):
- if nodetree in traversed:
- return
- traversed.add(nodetree)
+def foreach_cycles_nodetree_group(nodetree, traversed):
for node in nodetree.nodes:
- callback(node)
if node.bl_idname == 'ShaderNodeGroup':
- foreach_notree_node(node.node_tree, callback, traversed)
+ group = node.node_tree
+ if group and group not in traversed:
+ traversed.add(group)
+ yield group, group.library
+ yield from foreach_cycles_nodetree_group(group, traversed)
-def foreach_cycles_node(callback):
+def foreach_cycles_nodetree():
traversed = set()
+
for material in bpy.data.materials:
- if check_is_new_shading_material(material):
- foreach_notree_node(
- material.node_tree,
- callback,
- traversed,
- )
+ nodetree = material.node_tree
+ if nodetree:
+ yield nodetree, material.library
+ yield from foreach_cycles_nodetree_group(nodetree, traversed)
+
for world in bpy.data.worlds:
- if check_is_new_shading_world(world):
- foreach_notree_node(
- world.node_tree,
- callback,
- traversed,
- )
- for lamp in bpy.data.lamps:
- if check_is_new_shading_world(lamp):
- foreach_notree_node(
- lamp.node_tree,
- callback,
- traversed,
- )
+ nodetree = world.node_tree
+ if nodetree:
+ yield nodetree, world.library
+ foreach_cycles_nodetree_group(nodetree, traversed)
+ for lamp in bpy.data.lamps:
+ nodetree = lamp.node_tree
+ if nodetree:
+ yield nodetree, lamp.library
+ foreach_cycles_nodetree_group(nodetree, traversed)
-def displacement_node_insert(material, nodetree, traversed):
- if nodetree in traversed:
- return
- traversed.add(nodetree)
-
- for node in nodetree.nodes:
- if node.bl_idname == 'ShaderNodeGroup':
- displacement_node_insert(material, node.node_tree, traversed)
+def displacement_node_insert(nodetree):
# Gather links to replace
displacement_links = []
for link in nodetree.links:
@@ -134,12 +84,6 @@ def displacement_node_insert(material, nodetree, traversed):
nodetree.links.new(node.outputs['Displacement'], to_socket)
-def displacement_nodes_insert():
- traversed = set()
- for material in bpy.data.materials:
- if check_is_new_shading_material(material):
- displacement_node_insert(material, material.node_tree, traversed)
-
def displacement_principled_nodes(node):
if node.bl_idname == 'ShaderNodeDisplacement':
@@ -150,11 +94,7 @@ def displacement_principled_nodes(node):
node.subsurface_method = 'BURLEY'
-def square_roughness_node_insert(material, nodetree, traversed):
- if nodetree in traversed:
- return
- traversed.add(nodetree)
-
+def square_roughness_node_insert(nodetree):
roughness_node_types = {
'ShaderNodeBsdfAnisotropic',
'ShaderNodeBsdfGlass',
@@ -163,9 +103,7 @@ def square_roughness_node_insert(material, nodetree, traversed):
# Update default values
for node in nodetree.nodes:
- if node.bl_idname == 'ShaderNodeGroup':
- square_roughness_node_insert(material, node.node_tree, traversed)
- elif node.bl_idname in roughness_node_types:
+ if node.bl_idname in roughness_node_types:
roughness_input = node.inputs['Roughness']
roughness_input.default_value = math.sqrt(max(roughness_input.default_value, 0.0))
@@ -195,13 +133,6 @@ def square_roughness_node_insert(material, nodetree, traversed):
nodetree.links.new(node.outputs['Value'], to_socket)
-def square_roughness_nodes_insert():
- traversed = set()
- for material in bpy.data.materials:
- if check_is_new_shading_material(material):
- square_roughness_node_insert(material, material.node_tree, traversed)
-
-
def mapping_node_order_flip(node):
"""
Flip euler order of mapping shader node
@@ -283,18 +214,12 @@ def custom_bake_remap(scene):
scene.render.bake.use_pass_indirect = False
-def ambient_occlusion_node_relink(material, nodetree, traversed):
- if nodetree in traversed:
- return
- traversed.add(nodetree)
-
+def ambient_occlusion_node_relink(nodetree):
for node in nodetree.nodes:
if node.bl_idname == 'ShaderNodeAmbientOcclusion':
node.samples = 1
node.only_local = False
node.inputs['Distance'].default_value = 0.0
- elif node.bl_idname == 'ShaderNodeGroup':
- ambient_occlusion_node_relink(material, node.node_tree, traversed)
# Gather links to replace
ao_links = []
@@ -311,13 +236,6 @@ def ambient_occlusion_node_relink(material, nodetree, traversed):
nodetree.links.new(from_node.outputs['Color'], to_socket)
-def ambient_occlusion_nodes_relink():
- traversed = set()
- for material in bpy.data.materials:
- if check_is_new_shading_material(material):
- ambient_occlusion_node_relink(material, material.node_tree, traversed)
-
-
@persistent
def do_versions(self):
if bpy.context.user_preferences.version <= (2, 78, 1):
@@ -343,156 +261,186 @@ def do_versions(self):
if not bpy.data.is_saved:
return
- # Clamp Direct/Indirect separation in 270
- if bpy.data.version <= (2, 70, 0):
- for scene in bpy.data.scenes:
- cscene = scene.cycles
- sample_clamp = cscene.get("sample_clamp", False)
- if (
- sample_clamp and
- not cscene.is_property_set("sample_clamp_direct") and
- not cscene.is_property_set("sample_clamp_indirect")
- ):
-
- cscene.sample_clamp_direct = sample_clamp
- cscene.sample_clamp_indirect = sample_clamp
-
- # Change of Volume Bounces in 271
- if bpy.data.version <= (2, 71, 0):
- for scene in bpy.data.scenes:
- cscene = scene.cycles
- if not cscene.is_property_set("volume_bounces"):
- cscene.volume_bounces = 1
+ # Map of versions used by libraries.
+ library_versions = {}
+ library_versions[bpy.data.version] = [None]
+ for library in bpy.data.libraries:
+ library_versions.setdefault(library.version, []).append(library)
- # Caustics Reflective/Refractive separation in 272
- if bpy.data.version <= (2, 72, 0):
- for scene in bpy.data.scenes:
- cscene = scene.cycles
- if (
- cscene.get("no_caustics", False) and
- not cscene.is_property_set("caustics_reflective") and
- not cscene.is_property_set("caustics_refractive")
- ):
- cscene.caustics_reflective = False
- cscene.caustics_refractive = False
-
- # Euler order was ZYX in previous versions.
- if bpy.data.version <= (2, 73, 4):
- foreach_cycles_node(mapping_node_order_flip)
-
- if bpy.data.version <= (2, 76, 5):
- foreach_cycles_node(vector_curve_node_remap)
-
- # Baking types changed
- if bpy.data.version <= (2, 76, 6):
- for scene in bpy.data.scenes:
- custom_bake_remap(scene)
+ # Do versioning per library, since they might have different versions.
+ max_need_versioning = (2, 79, 6)
+ for version, libraries in library_versions.items():
+ if version > max_need_versioning:
+ continue
- # Several default changes for 2.77
- if bpy.data.version <= (2, 76, 8):
+ # Scenes
for scene in bpy.data.scenes:
- cscene = scene.cycles
-
- # Samples
- if not cscene.is_property_set("samples"):
- cscene.samples = 10
-
- # Preview Samples
- if not cscene.is_property_set("preview_samples"):
- cscene.preview_samples = 10
-
- # Filter
- if not cscene.is_property_set("filter_type"):
- cscene.pixel_filter_type = 'GAUSSIAN'
-
- # Tile Order
- if not cscene.is_property_set("tile_order"):
- cscene.tile_order = 'CENTER'
-
+ if scene.library not in libraries:
+ continue
+
+ # Clamp Direct/Indirect separation in 270
+ if version
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list