diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-26 23:40:55 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-26 23:40:55 +0400 |
| commit | 8cb78f1094e9b28b84a49edac47d32b8c333a545 (patch) | |
| tree | 6f1a76f888a0a314d7bb5d99fa570d13c10bd3b4 /intern | |
| parent | b98ff5cb5b2c14c33b16e3b129e1e08810e90a6c (diff) | |
Fix mistake in last commit with submodules.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 4 |
1 files changed, 2 insertions, 2 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; |