From 8cb78f1094e9b28b84a49edac47d32b8c333a545 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 26 Nov 2013 20:40:55 +0100 Subject: [PATCH] Fix mistake in last commit with submodules. --- intern/cycles/blender/blender_object.cpp | 4 ++-- release/scripts/addons | 2 +- release/scripts/addons_contrib | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index dfe97518a0f..4b93a5b614f 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -287,8 +287,8 @@ Object *BlenderSync::sync_object(BL::Object b_parent, int persistent_id[OBJECT_P if(use_holdout && (layer_flag & render_layer.exclude_layer)) visibility &= ~(PATH_RAY_ALL_VISIBILITY - PATH_RAY_CAMERA); - /* camera flag is not actually used, instead is tested - * against render layer flags */ + /* camera flag is not actually used, instead is tested against render layer + * flags */ if(visibility & PATH_RAY_CAMERA) { visibility |= layer_flag << PATH_RAY_LAYER_SHIFT; visibility &= ~PATH_RAY_CAMERA; diff --git a/release/scripts/addons b/release/scripts/addons index dbf7e49d9b3..6501c6cadfe 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit dbf7e49d9b37fa61b5c42d33864f6b4fbfa6d705 +Subproject commit 6501c6cadfef1804dfa4b7aa2eb208207570a42a diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index 4fe6a9e046f..6695fc64a51 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit 4fe6a9e046f9578a0dadb1186269ac5e406a8c15 +Subproject commit 6695fc64a51fcc64c96bc31c5b209a54d8ea9ba6