diff options
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 5 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 26 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 8 |
3 files changed, 18 insertions, 21 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 095ecd59985..00f53804e38 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -307,8 +307,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph, /* TODO: don't use lights for excluded layers used as mask layer, * when dynamic overrides are back. */ #if 0 - if(!((layer_flag & view_layer.holdout_layer) && - (layer_flag & view_layer.exclude_layer))) + if (!((layer_flag & view_layer.holdout_layer) && (layer_flag & view_layer.exclude_layer))) #endif { sync_light(b_parent, @@ -345,7 +344,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph, /* TODO: make holdout objects on excluded layer invisible for non-camera rays. */ #if 0 - if(use_holdout && (layer_flag & view_layer.exclude_layer)) { + if (use_holdout && (layer_flag & view_layer.exclude_layer)) { visibility &= ~(PATH_RAY_ALL_VISIBILITY - PATH_RAY_CAMERA); } #endif diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 169c4d414a6..5fd60ff7970 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -656,13 +656,12 @@ static ShaderNode *add_node(Scene *scene, /* TODO: restore */ /* TODO(sergey): Does not work properly when we change builtin type. */ #if 0 - if(b_image.is_updated()) { - scene->image_manager->tag_reload_image( - image->filename.string(), - image->builtin_data, - get_image_interpolation(b_image_node), - get_image_extension(b_image_node), - image->use_alpha); + if (b_image.is_updated()) { + scene->image_manager->tag_reload_image(image->filename.string(), + image->builtin_data, + get_image_interpolation(b_image_node), + get_image_extension(b_image_node), + image->use_alpha); } #endif } @@ -702,13 +701,12 @@ static ShaderNode *add_node(Scene *scene, /* TODO: restore */ /* TODO(sergey): Does not work properly when we change builtin type. */ #if 0 - if(b_image.is_updated()) { - scene->image_manager->tag_reload_image( - env->filename.string(), - env->builtin_data, - get_image_interpolation(b_env_node), - EXTENSION_REPEAT, - env->use_alpha); + if (b_image.is_updated()) { + scene->image_manager->tag_reload_image(env->filename.string(), + env->builtin_data, + get_image_interpolation(b_env_node), + EXTENSION_REPEAT, + env->use_alpha); } #endif } diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index e68f92474bf..500634e7526 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -54,8 +54,8 @@ static inline BL::Mesh object_to_mesh(BL::BlendData &data, bool subsurf_mod_show_render = false; bool subsurf_mod_show_viewport = false; - if(subdivision_type != Mesh::SUBDIVISION_NONE) { - BL::Modifier subsurf_mod = object.modifiers[object.modifiers.length()-1]; + if (subdivision_type != Mesh::SUBDIVISION_NONE) { + BL::Modifier subsurf_mod = object.modifiers[object.modifiers.length() - 1]; subsurf_mod_show_render = subsurf_mod.show_render(); subsurf_mod_show_viewport = subsurf_mod.show_viewport(); @@ -83,8 +83,8 @@ static inline BL::Mesh object_to_mesh(BL::BlendData &data, } #if 0 - if(subdivision_type != Mesh::SUBDIVISION_NONE) { - BL::Modifier subsurf_mod = object.modifiers[object.modifiers.length()-1]; + if (subdivision_type != Mesh::SUBDIVISION_NONE) { + BL::Modifier subsurf_mod = object.modifiers[object.modifiers.length() - 1]; subsurf_mod.show_render(subsurf_mod_show_render); subsurf_mod.show_viewport(subsurf_mod_show_viewport); |