1 files changed, 84 insertions, 1 deletions

diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index eaeec703ff5..2fbb01ba5b8 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -11,7 +11,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License
+# limitations under the License.
 #
 
 # <pep8 compliant>
@@ -21,6 +21,85 @@ import bpy
 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)
+    for node in nodetree.nodes:
+        callback(node)
+        if node.bl_idname == 'ShaderNodeGroup':
+            foreach_notree_node(node.node_tree, callback, traversed)
+
+
+def foreach_cycles_node(callback):
+    traversed = set()
+    for material in bpy.data.materials:
+        if check_is_new_shading_material(material):
+                foreach_notree_node(material.node_tree,
+                                    callback,
+                                    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)
+
+
+def mapping_node_order_flip(node):
+    """
+    Flip euler order of mapping shader node
+    """
+    if node.bl_idname == 'ShaderNodeMapping':
+        rot = node.rotation.copy()
+        rot.order = 'ZYX'
+        quat = rot.to_quaternion()
+        node.rotation = quat.to_euler('XYZ')
+
+
 @persistent
 def do_versions(self):
     # We don't modify startup file because it assumes to
@@ -57,3 +136,7 @@ def do_versions(self):
 
                 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)