diff options
| -rw-r--r-- | intern/cycles/blender/addon/version_update.py | 57 | ||||
| -rw-r--r-- | intern/cycles/util/util_transform.h | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 |
3 files changed, 61 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py index 84414123a8c..741c2010774 100644 --- a/intern/cycles/blender/addon/version_update.py +++ b/intern/cycles/blender/addon/version_update.py @@ -21,6 +21,59 @@ import bpy from bpy.app.handlers import persistent +def check_is_new_shading_material(material): + if not material.node_tree: + return False + for node in material.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 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) + + +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 +110,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) diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h index 453d44bdcce..ac97fa53084 100644 --- a/intern/cycles/util/util_transform.h +++ b/intern/cycles/util/util_transform.h @@ -216,12 +216,13 @@ ccl_device_inline Transform transform_rotate(float angle, float3 axis) 0.0f, 0.0f, 0.0f, 1.0f); } +/* Euler is assumed to be in XYZ order. */ ccl_device_inline Transform transform_euler(float3 euler) { return - transform_rotate(euler.x, make_float3(1.0f, 0.0f, 0.0f)) * + transform_rotate(euler.z, make_float3(0.0f, 0.0f, 1.0f)) * transform_rotate(euler.y, make_float3(0.0f, 1.0f, 0.0f)) * - transform_rotate(euler.z, make_float3(0.0f, 0.0f, 1.0f)); + transform_rotate(euler.x, make_float3(1.0f, 0.0f, 0.0f)); } ccl_device_inline Transform transform_orthographic(float znear, float zfar) diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 3053c9906c2..cb8a68dbc02 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -42,7 +42,7 @@ extern "C" { * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 273 -#define BLENDER_SUBVERSION 3 +#define BLENDER_SUBVERSION 4 /* 262 was the last editmesh release but it has compatibility code for bmesh data */ #define BLENDER_MINVERSION 270 #define BLENDER_MINSUBVERSION 5 |