griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

SceneRenderLayer > SceneLayer: Remove exclude_layer

Browse Source 
Note: It is up to Cycles to still get rid of exclude_layer internally:
RenderLayerInfo.exclude_layer
This commit is contained in:
Dalai Felinto
2017-11-14 16:18:14 -02:00
parent 846cdf5318
commit 9ce2370ce4
7 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenloader/intern/versioning_280.c
View File

@@ -321,7 +321,10 @@ void do_versions_after_linking_280(Main *main)
/* Add new collection bases. */
for (int layer = 0; layer < 20; layer++) {
if ((srl->lay & (1 << layer)) && (scene->lay & (1 << layer))) {
if ((scene->lay & (1 << layer)) &&
(srl->lay & (1 << layer)) &&
((srl->lay_exclude & (1 << layer)) == 0))
{
if (collections[DO_VERSION_COLLECTION_VISIBLE].created & (1 << layer)) {
LayerCollection *layer_collection_parent;

2
source/blender/makesdna/DNA_scene_types.h
View File

@@ -179,7 +179,7 @@ typedef struct SceneRenderLayer {
unsigned int lay; /* scene->lay itself has priority over this */
unsigned int lay_zmask; /* has to be after lay, this is for Z-masking */
unsigned int lay_exclude; /* not used by internal, exclude */
unsigned int lay_exclude DNA_DEPRECATED;
int layflag;
int passflag; /* pass_xor has to be after passflag */

7
source/blender/makesrna/intern/rna_scene.c
View File

@@ -3317,13 +3317,6 @@ void rna_def_render_layer_common(StructRNA *srna, int scene)
if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "layers_exclude", PROP_BOOLEAN, PROP_LAYER);
RNA_def_property_boolean_sdna(prop, NULL, "lay_exclude", 1);
RNA_def_property_array(prop, 20);
RNA_def_property_ui_text(prop, "Exclude Layers", "Exclude scene layers from having any influence");
if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
if (scene) {
prop = RNA_def_property(srna, "samples", PROP_INT, PROP_UNSIGNED);
RNA_def_property_ui_text(prop, "Samples", "Override number of render samples for this render layer, "

2
source/blender/render/extern/include/RE_pipeline.h vendored
View File

@@ -108,7 +108,7 @@ typedef struct RenderLayer {
/* copy of RenderData */
char name[RE_MAXNAME];
unsigned int lay, lay_zmask, lay_exclude;
unsigned int lay, lay_zmask;
int layflag, passflag, pass_xor;
struct Material *mat_override;

1
source/blender/render/intern/source/render_result.c
View File

@@ -315,7 +315,6 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
BLI_strncpy(rl->name, srl->name, sizeof(rl->name));
rl->lay = srl->lay;
rl->lay_zmask = srl->lay_zmask;
rl->lay_exclude = srl->lay_exclude;
rl->layflag = srl->layflag;
rl->passflag = srl->passflag; /* for debugging: srl->passflag | SCE_PASS_RAYHITS; */
rl->pass_xor = srl->pass_xor;