Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix mistake in last commit with submodules.

Browse Source
This commit is contained in:
Brecht Van Lommel
2013-11-26 20:40:55 +01:00
parent b98ff5cb5b
commit 8cb78f1094
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_object.cpp
View File

@@ -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;

2
release/scripts/addons

Submodule release/scripts/addons updated: dbf7e49d9b...6501c6cadf

2
release/scripts/addons_contrib

Submodule release/scripts/addons_contrib updated: 4fe6a9e046...6695fc64a5