archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
b365cc017adf3a8fb36006d6cb194d28be02e6d4
blender-archive/source/blender/makesrna/intern/rna_layer.c

2037 lines
93 KiB
C
Raw Normal View History

Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Contributor(s): Blender Foundation.
*
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/makesrna/intern/rna_layer.c
* \ingroup RNA
*/
#include "DNA_scene_types.h"
#include "DNA_layer_types.h"
Workbench: Option to use Object color - added `object_color_type` where the user can set if the collection determines the color, or the object will be used for the color. Implemented it as an enum as later this can have a random color option. - moved OB_LIGHTING_* to DNA_view3d_types and renamed it. - Fixed some DRY in workbench_materials.c. Can remove more DRY's but will need to discuss the responsibility of the workbench engine as it might become part of the eevee renderer.
2018-04-19 09:45:52 +02:00
#include "DNA_view3d_types.h"
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#include "BLI_math.h"
#include "BLI_string_utils.h"
#include "BLT_translation.h"
#include "ED_object.h"
#include "ED_render.h"
#include "RE_engine.h"
#include "DRW_engine.h"
#include "WM_api.h"
#include "WM_types.h"
#include "RNA_define.h"
#include "rna_internal.h"
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
const EnumPropertyItem rna_enum_collection_type_items[] = {
{COLLECTION_TYPE_NONE, "NONE", 0, "Normal", ""},
{COLLECTION_TYPE_GROUP_INTERNAL, "GROUP_INTERNAL", 0, "Group Internal", ""},
{0, NULL, 0, NULL, NULL}
};
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#ifdef RNA_RUNTIME
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
#include "DNA_group_types.h"
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#include "DNA_object_types.h"
#include "RNA_access.h"
#include "BKE_idprop.h"
#include "BKE_layer.h"
#include "BKE_node.h"
#include "BKE_scene.h"
#include "BKE_mesh.h"
rna_layer.c cleanup: remove uneeded includes I have cleaned up the ones before "#ifdef RNA_RUNTIME", and forgot about the ones after.
2017-10-24 09:18:35 -02:00
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#include "DEG_depsgraph_build.h"
#include "DEG_depsgraph_query.h"
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
static StructRNA *rna_SceneCollection_refine(PointerRNA *ptr)
{
SceneCollection *scene_collection = (SceneCollection *)ptr->data;
switch (scene_collection->type) {
case COLLECTION_TYPE_GROUP_INTERNAL:
case COLLECTION_TYPE_NONE:
return &RNA_SceneCollection;
default:
BLI_assert(!"Collection type not fully implemented");
break;
}
return &RNA_SceneCollection;
}
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
static void rna_SceneCollection_name_set(PointerRNA *ptr, const char *value)
{
Scene *scene = (Scene *)ptr->id.data;
SceneCollection *sc = (SceneCollection *)ptr->data;
Fix warning after fix for crash on renaming group collections Warning introduced on: 73079e01fd4.
2018-02-19 11:10:19 -03:00
BKE_collection_rename(&scene->id, sc, value);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
static PointerRNA rna_SceneCollection_objects_get(CollectionPropertyIterator *iter)
{
ListBaseIterator *internal = &iter->internal.listbase;
/* we are actually iterating a LinkData list, so override get */
return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, ((LinkData *)internal->link)->data);
}
static int rna_SceneCollection_move_above(ID *id, SceneCollection *sc_src, Main *bmain, SceneCollection *sc_dst)
{
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
if (!BKE_collection_move_above(id, sc_dst, sc_src)) {
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
return 0;
}
DEG_relations_tag_update(bmain);
WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
return 1;
}
static int rna_SceneCollection_move_below(ID *id, SceneCollection *sc_src, Main *bmain, SceneCollection *sc_dst)
{
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
if (!BKE_collection_move_below(id, sc_dst, sc_src)) {
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
return 0;
}
DEG_relations_tag_update(bmain);
WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
return 1;
}
static int rna_SceneCollection_move_into(ID *id, SceneCollection *sc_src, Main *bmain, SceneCollection *sc_dst)
{
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
if (!BKE_collection_move_into(id, sc_dst, sc_src)) {
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
return 0;
}
DEG_relations_tag_update(bmain);
WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
return 1;
}
Collections: Operator to duplicate a collection When duplicating a layer collection directly linked to the view layer we copy the collection and link it. For all the not directly linked layer collectionns, we try to sync the layer collection flags, overrides, ... Also we make sure the new collection is right after the original collection. We also expose this in RNA, via collection.duplicate().
2018-02-01 21:11:59 -02:00
static SceneCollection *rna_SceneCollection_duplicate(
ID *id, SceneCollection *scene_collection, Main *bmain, bContext *C, ReportList *reports)
{
if (scene_collection == BKE_collection_master(id)) {
BKE_report(reports, RPT_ERROR, "The master collection can't be duplicated");
return NULL;
}
SceneCollection *scene_collection_new = BKE_collection_duplicate(id, scene_collection);
DEG_relations_tag_update(bmain);
/* Don't use id here, since the layer collection may come from a group. */
WM_event_add_notifier(C, NC_SCENE | ND_LAYER, CTX_data_scene(C));
return scene_collection_new;
}
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
static SceneCollection *rna_SceneCollection_new(
ID *id, SceneCollection *sc_parent, Main *bmain, const char *name)
{
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
SceneCollection *sc = BKE_collection_add(id, sc_parent, COLLECTION_TYPE_NONE, name);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
DEG_relations_tag_update(bmain);
WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
return sc;
}
static void rna_SceneCollection_remove(
ID *id, SceneCollection *sc_parent, Main *bmain, ReportList *reports, PointerRNA *sc_ptr)
{
SceneCollection *sc = sc_ptr->data;
const int index = BLI_findindex(&sc_parent->scene_collections, sc);
if (index == -1) {
BKE_reportf(reports, RPT_ERROR, "Collection '%s' is not a sub-collection of '%s'",
sc->name, sc_parent->name);
return;
}
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
if (!BKE_collection_remove(id, sc)) {
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
BKE_reportf(reports, RPT_ERROR, "Collection '%s' could not be removed from collection '%s'",
sc->name, sc_parent->name);
return;
}
RNA_POINTER_INVALIDATE(sc_ptr);
DEG_relations_tag_update(bmain);
WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
}
static int rna_SceneCollection_objects_active_index_get(PointerRNA *ptr)
{
SceneCollection *sc = (SceneCollection *)ptr->data;
return sc->active_object_index;
}
static void rna_SceneCollection_objects_active_index_set(PointerRNA *ptr, int value)
{
SceneCollection *sc = (SceneCollection *)ptr->data;
sc->active_object_index = value;
}
static void rna_SceneCollection_objects_active_index_range(
PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax))
{
SceneCollection *sc = (SceneCollection *)ptr->data;
*min = 0;
*max = max_ii(0, BLI_listbase_count(&sc->objects) - 1);
}
void rna_SceneCollection_object_link(
ID *id, SceneCollection *sc, Main *bmain, ReportList *reports, Object *ob)
{
Scene *scene = (Scene *)id;
if (BLI_findptr(&sc->objects, ob, offsetof(LinkData, data))) {
BKE_reportf(reports, RPT_ERROR, "Object '%s' is already in collection '%s'", ob->id.name + 2, sc->name);
return;
}
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
BKE_collection_object_add(&scene->id, sc, ob);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* TODO(sergey): Only update relations for the current scene. */
DEG_relations_tag_update(bmain);
/* TODO(sergey): Use proper flag for tagging here. */
DEG_id_tag_update(&scene->id, 0);
DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
WM_main_add_notifier(NC_SCENE | ND_LAYER | ND_OB_ACTIVE, scene);
}
static void rna_SceneCollection_object_unlink(
ID *id, SceneCollection *sc, Main *bmain, ReportList *reports, Object *ob)
{
Scene *scene = (Scene *)id;
if (!BLI_findptr(&sc->objects, ob, offsetof(LinkData, data))) {
BKE_reportf(reports, RPT_ERROR, "Object '%s' is not in collection '%s'", ob->id.name + 2, sc->name);
return;
}
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
BKE_collection_object_remove(bmain, &scene->id, sc, ob, false);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* needed otherwise the depgraph will contain freed objects which can crash, see [#20958] */
DEG_relations_tag_update(bmain);
WM_main_add_notifier(NC_SCENE | ND_LAYER | ND_OB_ACTIVE, scene);
}
/****** layer collection engine settings *******/
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
#define RNA_LAYER_ENGINE_GET_SET(_TYPE_, _ENGINE_, _NAME_) \
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
static _TYPE_ rna_LayerEngineSettings_##_ENGINE_##_##_NAME_##_get(PointerRNA *ptr) \
{ \
IDProperty *props = (IDProperty *)ptr->data; \
return BKE_collection_engine_property_value_get_##_TYPE_(props, #_NAME_); \
} \
\
static void rna_LayerEngineSettings_##_ENGINE_##_##_NAME_##_set(PointerRNA *ptr, _TYPE_ value) \
{ \
IDProperty *props = (IDProperty *)ptr->data; \
BKE_collection_engine_property_value_set_##_TYPE_(props, #_NAME_, value); \
}
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
#define RNA_LAYER_ENGINE_GET_SET_ARRAY(_TYPE_, _ENGINE_, _NAME_, _LEN_) \
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
static void rna_LayerEngineSettings_##_ENGINE_##_##_NAME_##_get(PointerRNA *ptr, _TYPE_ *values) \
{ \
IDProperty *props = (IDProperty *)ptr->data; \
IDProperty *idprop = IDP_GetPropertyFromGroup(props, #_NAME_); \
if (idprop != NULL) { \
memcpy(values, IDP_Array(idprop), sizeof(_TYPE_) * idprop->len); \
} \
} \
\
static void rna_LayerEngineSettings_##_ENGINE_##_##_NAME_##_set(PointerRNA *ptr, const _TYPE_ *values) \
{ \
IDProperty *props = (IDProperty *)ptr->data; \
BKE_collection_engine_property_value_set_##_TYPE_##_array(props, #_NAME_, values); \
}
#define RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(_NAME_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET(float, Clay, _NAME_)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#define RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT_ARRAY(_NAME_, _LEN_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET_ARRAY(float, Clay, _NAME_, _LEN_)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#define RNA_LAYER_ENGINE_CLAY_GET_SET_INT(_NAME_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET(int, Clay, _NAME_)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#define RNA_LAYER_ENGINE_CLAY_GET_SET_BOOL(_NAME_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET(bool, Clay, _NAME_)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#define RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(_NAME_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET(float, Eevee, _NAME_)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#define RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT_ARRAY(_NAME_, _LEN_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET_ARRAY(float, Eevee, _NAME_, _LEN_)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#define RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(_NAME_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET(int, Eevee, _NAME_)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#define RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(_NAME_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET(bool, Eevee, _NAME_)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
Workbench: Added Object Color to collection_properties
2018-04-16 15:01:31 +02:00
#define RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT_ARRAY(_NAME_, _LEN_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET_ARRAY(float, Workbench, _NAME_, _LEN_)
Workbench: Added Object Color to collection_properties
2018-04-16 15:01:31 +02:00
Silhouette Overlap Overlay Added Object Overlap Overlay - Added R32UI support to GPU_framebuffer - Added R32U support to draw manager - The overlay mode has a object data pass that will render 'needed' data to specific buffers so we can mix them together via a deferred rendering. In future will also add UV's and other data - Overlap is implemented as an overlay so it could be used on top of the Scene lighted Solid mode (that will be rendered by Eevee. Reviewers: fclem, brecht Reviewed By: fclem Subscribers: sergey Tags: #code_quest Maniphest Tasks: T54726 Differential Revision: https://developer.blender.org/D3174
2018-04-25 10:59:48 +02:00
#define RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT(_NAME_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET(float, Workbench, _NAME_)
Silhouette Overlap Overlay Added Object Overlap Overlay - Added R32UI support to GPU_framebuffer - Added R32U support to draw manager - The overlay mode has a object data pass that will render 'needed' data to specific buffers so we can mix them together via a deferred rendering. In future will also add UV's and other data - Overlap is implemented as an overlay so it could be used on top of the Scene lighted Solid mode (that will be rendered by Eevee. Reviewers: fclem, brecht Reviewed By: fclem Subscribers: sergey Tags: #code_quest Maniphest Tasks: T54726 Differential Revision: https://developer.blender.org/D3174
2018-04-25 10:59:48 +02:00
Workbench: Option to use Object color - added `object_color_type` where the user can set if the collection determines the color, or the object will be used for the color. Implemented it as an enum as later this can have a random color option. - moved OB_LIGHTING_* to DNA_view3d_types and renamed it. - Fixed some DRY in workbench_materials.c. Can remove more DRY's but will need to discuss the responsibility of the workbench engine as it might become part of the eevee renderer.
2018-04-19 09:45:52 +02:00
#define RNA_LAYER_ENGINE_WORKBENCH_GET_SET_INT(_NAME_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET(int, Workbench, _NAME_)
Workbench: Option to use Object color - added `object_color_type` where the user can set if the collection determines the color, or the object will be used for the color. Implemented it as an enum as later this can have a random color option. - moved OB_LIGHTING_* to DNA_view3d_types and renamed it. - Fixed some DRY in workbench_materials.c. Can remove more DRY's but will need to discuss the responsibility of the workbench engine as it might become part of the eevee renderer.
2018-04-19 09:45:52 +02:00
Workbench: Shadows Initial review of the shard shadows in the workbench engine. Speed optimizations like transform feedback are not implemented yet. I first want this part to be reviewed and merged. @fclem please check the note in drw_stencil_set it was holding back nequal == 0 as by default DST.stencil_mask was set to 0. questioin is should we remove the whole check or not. Also I am still looking for a better name (or split the enum) for DRW_STATE_STENCIL_DEPTH_FAIL_INCR_DECR_WRAP Reviewers: fclem Reviewed By: fclem Tags: #code_quest Differential Revision: https://developer.blender.org/D3198
2018-05-04 14:07:00 +02:00
#define RNA_LAYER_ENGINE_WORKBENCH_GET_SET_BOOL(_NAME_) \
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
RNA_LAYER_ENGINE_GET_SET(bool, Workbench, _NAME_)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* clay engine */
#ifdef WITH_CLAY_ENGINE
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
/* ViewLayer settings. */
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_LAYER_ENGINE_CLAY_GET_SET_INT(ssao_samples)
/* LayerCollection settings. */
RNA_LAYER_ENGINE_CLAY_GET_SET_INT(matcap_icon)
RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(matcap_rotation)
RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(matcap_hue)
RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(matcap_saturation)
RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(matcap_value)
RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(ssao_factor_cavity)
RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(ssao_factor_edge)
RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(ssao_distance)
RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(ssao_attenuation)
RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(hair_brightness_randomness)
#endif /* WITH_CLAY_ENGINE */
Silhouette Overlap Overlay Added Object Overlap Overlay - Added R32UI support to GPU_framebuffer - Added R32U support to draw manager - The overlay mode has a object data pass that will render 'needed' data to specific buffers so we can mix them together via a deferred rendering. In future will also add UV's and other data - Overlap is implemented as an overlay so it could be used on top of the Scene lighted Solid mode (that will be rendered by Eevee. Reviewers: fclem, brecht Reviewed By: fclem Subscribers: sergey Tags: #code_quest Maniphest Tasks: T54726 Differential Revision: https://developer.blender.org/D3174
2018-04-25 10:59:48 +02:00
/* workbench engine */
Workbench: Added studio lighting to view layer
2018-04-25 15:59:15 +02:00
/* Collection settings */
Silhouette Overlap Overlay Added Object Overlap Overlay - Added R32UI support to GPU_framebuffer - Added R32U support to draw manager - The overlay mode has a object data pass that will render 'needed' data to specific buffers so we can mix them together via a deferred rendering. In future will also add UV's and other data - Overlap is implemented as an overlay so it could be used on top of the Scene lighted Solid mode (that will be rendered by Eevee. Reviewers: fclem, brecht Reviewed By: fclem Subscribers: sergey Tags: #code_quest Maniphest Tasks: T54726 Differential Revision: https://developer.blender.org/D3174
2018-04-25 10:59:48 +02:00
RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT(random_object_color_saturation)
RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT(random_object_color_value)
Workbench: Added studio lighting to view layer
2018-04-25 15:59:15 +02:00
/* View Layer settings */
Workbench: Shadows Initial review of the shard shadows in the workbench engine. Speed optimizations like transform feedback are not implemented yet. I first want this part to be reviewed and merged. @fclem please check the note in drw_stencil_set it was holding back nequal == 0 as by default DST.stencil_mask was set to 0. questioin is should we remove the whole check or not. Also I am still looking for a better name (or split the enum) for DRW_STATE_STENCIL_DEPTH_FAIL_INCR_DECR_WRAP Reviewers: fclem Reviewed By: fclem Tags: #code_quest Differential Revision: https://developer.blender.org/D3198
2018-05-04 14:07:00 +02:00
RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT_ARRAY(light_direction, 3)
Silhouette Overlap Overlay Added Object Overlap Overlay - Added R32UI support to GPU_framebuffer - Added R32U support to draw manager - The overlay mode has a object data pass that will render 'needed' data to specific buffers so we can mix them together via a deferred rendering. In future will also add UV's and other data - Overlap is implemented as an overlay so it could be used on top of the Scene lighted Solid mode (that will be rendered by Eevee. Reviewers: fclem, brecht Reviewed By: fclem Subscribers: sergey Tags: #code_quest Maniphest Tasks: T54726 Differential Revision: https://developer.blender.org/D3174
2018-04-25 10:59:48 +02:00
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* eevee engine */
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
/* ViewLayer settings. */
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(gtao_enable)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(gtao_use_bent_normals)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(gtao_bounce)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(gtao_factor)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(gtao_quality)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(gtao_distance)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(dof_enable)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(bokeh_max_size)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(bokeh_threshold)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(bloom_enable)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(bloom_threshold)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT_ARRAY(bloom_color, 3)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(bloom_knee)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(bloom_radius)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(bloom_clamp)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(bloom_intensity)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(motion_blur_enable)
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(motion_blur_samples)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(motion_blur_shutter)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(volumetric_enable)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(volumetric_start)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(volumetric_end)
Eevee: Overhaul the volumetric system. The system now uses several 3D textures in order to decouple every steps of the volumetric rendering. See https://www.ea.com/frostbite/news/physically-based-unified-volumetric-rendering-in-frostbite for more details. On the technical side, instead of using a compute shader to populate the 3D textures we use layered rendering with a geometry shader to render 1 fullscreen triangle per 3D texture slice.
2017-10-24 14:49:00 +02:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(volumetric_tile_size)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(volumetric_samples)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(volumetric_sample_distribution)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(volumetric_lights)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(volumetric_light_clamp)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(volumetric_shadows)
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(volumetric_shadow_samples)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(volumetric_colored_transmittance)
Eevee: Initial Separable Subsurface Scattering implementation. How to use: - Enable subsurface scattering in the render options. - Add Subsurface BSDF to your shader. - Check "Screen Space Subsurface Scattering" in the material panel options. This initial implementation has a few limitations: - only supports gaussian SSS. - Does not support principled shader. - The radius parameters is baked down to a number of samples and then put into an UBO. This means the radius input socket cannot be used. You need to tweak the default vector directly. - The "texture blur" is considered as always set to 1
2017-11-14 00:49:54 +01:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(sss_enable)
Eevee: SSS: Add Quality settings. Samples : pretty self explanatory. Jitter Threshold : Reduce cache misses and improve performance (greatly) by lowering this value. This settings let user decide how many samples should be jittered (rotated) to reduce banding artifacts.
2017-11-14 02:17:34 +01:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(sss_samples)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(sss_jitter_threshold)
Eevee: SSS: Add separated Albedo option. This option prevent from automatically blurring the albedo color applied to the SSS. While this is great for preserving details it can bleed more light onto the nearby objects since the blurring will be done on pure "white" irradiance. This issue is to be tackled in a separate commit.
2017-11-24 22:29:18 +01:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(sss_separate_albedo)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(ssr_refraction)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(ssr_enable)
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(ssr_halfres)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(ssr_quality)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(ssr_max_roughness)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(ssr_thickness)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(ssr_border_fade)
RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(ssr_firefly_fac)
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(shadow_method)
Eevee: Shadows: Separate Cube and Cascade shadow maps into 2 texture array. This mean we can now have different shadow resolutions for both. However each shadow type keep the same size accross all lamps because of future "real" Cube Shadowmaps limitation and to save texture sampler slots. That said the cascade shadow resolution could (in the future) still be changed to be adjustable per sun lamp.
2018-05-04 14:39:05 +02:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(shadow_cube_size)
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(shadow_cascade_size)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(shadow_high_bitdepth)
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(taa_samples)
Eevee: Add new "render samples" properties.
2018-01-29 19:39:07 +01:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(taa_render_samples)
Eevee: TAA Reprojection: Add layer property.
2018-04-20 18:20:39 +02:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(taa_reprojection)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(gi_diffuse_bounces)
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(gi_cubemap_resolution)
Eevee: Irradiance Visibility: Add RNA / Engine properties
2017-12-02 13:01:40 +01:00
RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(gi_visibility_resolution)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#undef RNA_LAYER_ENGINE_GET_SET
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static void rna_ViewLayerEngineSettings_update(bContext *C, PointerRNA *UNUSED(ptr))
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
Scene *scene = CTX_data_scene(C);
/* TODO(sergey): Use proper flag for tagging here. */
DEG_id_tag_update(&scene->id, 0);
}
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
static void rna_LayerCollectionEngineSettings_update(bContext *UNUSED(C), PointerRNA *ptr)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
ID *id = ptr->id.data;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* TODO(sergey): Use proper flag for tagging here. */
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
DEG_id_tag_update(id, 0);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
/* Instead of passing 'noteflag' to the rna update function, we handle the notifier ourselves.
* We need to do this because the LayerCollection may be coming from different ID types (Scene or Group)
* and when using NC_SCENE the id most match the active scene for the listener to receive the notification.*/
WM_main_add_notifier(NC_SCENE | ND_LAYER_CONTENT, NULL);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
/***********************************/
static void engine_settings_use(IDProperty *root, IDProperty *props, PointerRNA *props_ptr, const char *identifier)
{
PropertyRNA *prop = RNA_struct_find_property(props_ptr, identifier);
switch (RNA_property_type(prop)) {
case PROP_FLOAT:
{
float value = BKE_collection_engine_property_value_get_float(props, identifier);
BKE_collection_engine_property_add_float(root, identifier, value);
break;
}
case PROP_ENUM:
{
int value = BKE_collection_engine_property_value_get_int(props, identifier);
BKE_collection_engine_property_add_int(root, identifier, value);
break;
}
case PROP_INT:
{
int value = BKE_collection_engine_property_value_get_int(props, identifier);
BKE_collection_engine_property_add_int(root, identifier, value);
break;
}
case PROP_BOOLEAN:
{
int value = BKE_collection_engine_property_value_get_int(props, identifier);
BKE_collection_engine_property_add_bool(root, identifier, value);
break;
}
case PROP_STRING:
case PROP_POINTER:
case PROP_COLLECTION:
default:
break;
}
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static StructRNA *rna_ViewLayerSettings_refine(PointerRNA *ptr)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
IDProperty *props = (IDProperty *)ptr->data;
BLI_assert(props && props->type == IDP_GROUP);
switch (props->subtype) {
case IDP_GROUP_SUB_ENGINE_RENDER:
#ifdef WITH_CLAY_ENGINE
if (STREQ(props->name, RE_engine_id_BLENDER_CLAY)) {
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
return &RNA_ViewLayerEngineSettingsClay;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
#endif
if (STREQ(props->name, RE_engine_id_BLENDER_EEVEE)) {
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
return &RNA_ViewLayerEngineSettingsEevee;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
Workbench: Added studio lighting to view layer
2018-04-25 15:59:15 +02:00
else if (STREQ(props->name, RE_engine_id_BLENDER_WORKBENCH)) {
return &RNA_ViewLayerEngineSettingsWorkbench;
}
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
break;
default:
BLI_assert(!"Mode not fully implemented");
break;
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
return &RNA_ViewLayerSettings;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static void rna_ViewLayerSettings_name_get(PointerRNA *ptr, char *value)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
IDProperty *props = (IDProperty *)ptr->data;
strcpy(value, props->name);
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static int rna_ViewLayerSettings_name_length(PointerRNA *ptr)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
IDProperty *props = (IDProperty *)ptr->data;
return strnlen(props->name, sizeof(props->name));
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static void rna_ViewLayerSettings_use(ID *id, IDProperty *props, const char *identifier)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
Scene *scene = (Scene *)id;
PointerRNA scene_props_ptr;
IDProperty *scene_props;
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
scene_props = BKE_view_layer_engine_scene_get(scene, props->name);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_pointer_create(id, &RNA_ViewLayerSettings, scene_props, &scene_props_ptr);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
engine_settings_use(props, scene_props, &scene_props_ptr, identifier);
/* TODO(sergey): Use proper flag for tagging here. */
DEG_id_tag_update(id, 0);
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static void rna_ViewLayerSettings_unuse(ID *id, IDProperty *props, const char *identifier)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
IDProperty *prop_to_remove = IDP_GetPropertyFromGroup(props, identifier);
IDP_FreeFromGroup(props, prop_to_remove);
/* TODO(sergey): Use proper flag for tagging here. */
DEG_id_tag_update(id, 0);
}
static StructRNA *rna_LayerCollectionSettings_refine(PointerRNA *ptr)
{
IDProperty *props = (IDProperty *)ptr->data;
BLI_assert(props && props->type == IDP_GROUP);
switch (props->subtype) {
case IDP_GROUP_SUB_ENGINE_RENDER:
#ifdef WITH_CLAY_ENGINE
if (STREQ(props->name, RE_engine_id_BLENDER_CLAY)) {
return &RNA_LayerCollectionEngineSettingsClay;
}
#endif
Workbench: Added Object Color to collection_properties
2018-04-16 15:01:31 +02:00
if (STREQ(props->name, RE_engine_id_BLENDER_WORKBENCH)) {
return &RNA_LayerCollectionEngineSettingsWorkbench;
}
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
if (STREQ(props->name, RE_engine_id_BLENDER_EEVEE)) {
/* printf("Mode not fully implemented\n"); */
return &RNA_LayerCollectionSettings;
}
break;
default:
BLI_assert(!"Mode not fully implemented");
break;
}
return &RNA_LayerCollectionSettings;
}
static void rna_LayerCollectionSettings_name_get(PointerRNA *ptr, char *value)
{
IDProperty *props = (IDProperty *)ptr->data;
strcpy(value, props->name);
}
static int rna_LayerCollectionSettings_name_length(PointerRNA *ptr)
{
IDProperty *props = (IDProperty *)ptr->data;
return strnlen(props->name, sizeof(props->name));
}
static void rna_LayerCollectionSettings_use(ID *id, IDProperty *props, const char *identifier)
{
Scene *scene = (Scene *)id;
PointerRNA scene_props_ptr;
IDProperty *scene_props;
3D Viewport: move overlay settings from collections to 3D viewport. For some we may add per object overrides, but for most we plan to keep them strictly per viewport settings. Display settings from the mesh still need to be moved here, only collections were done to remove that code.
2018-05-03 15:09:09 +02:00
scene_props = BKE_layer_collection_engine_scene_get(scene, props->name);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_pointer_create(id, &RNA_LayerCollectionSettings, scene_props, &scene_props_ptr);
engine_settings_use(props, scene_props, &scene_props_ptr, identifier);
/* TODO(sergey): Use proper flag for tagging here. */
DEG_id_tag_update(id, 0);
}
static void rna_LayerCollectionSettings_unuse(ID *id, IDProperty *props, const char *identifier)
{
IDProperty *prop_to_remove = IDP_GetPropertyFromGroup(props, identifier);
IDP_FreeFromGroup(props, prop_to_remove);
/* TODO(sergey): Use proper flag for tagging here. */
DEG_id_tag_update(id, 0);
}
static void rna_LayerCollection_name_get(PointerRNA *ptr, char *value)
{
SceneCollection *sc = ((LayerCollection *)ptr->data)->scene_collection;
strcpy(value, sc->name);
}
static int rna_LayerCollection_name_length(PointerRNA *ptr)
{
SceneCollection *sc = ((LayerCollection *)ptr->data)->scene_collection;
return strnlen(sc->name, sizeof(sc->name));
}
static void rna_LayerCollection_name_set(PointerRNA *ptr, const char *value)
{
Fix warning after fix for crash on renaming group collections Warning introduced on: 73079e01fd4.
2018-02-19 11:10:19 -03:00
ID *owner_id = (ID *)ptr->id.data;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
SceneCollection *sc = ((LayerCollection *)ptr->data)->scene_collection;
Fix warning after fix for crash on renaming group collections Warning introduced on: 73079e01fd4.
2018-02-19 11:10:19 -03:00
BKE_collection_rename(owner_id, sc, value);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
static PointerRNA rna_LayerCollection_objects_get(CollectionPropertyIterator *iter)
{
ListBaseIterator *internal = &iter->internal.listbase;
Base *base = ((LinkData *)internal->link)->data;
return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, base->object);
}
static int rna_LayerCollection_move_above(ID *id, LayerCollection *lc_src, Main *bmain, LayerCollection *lc_dst)
{
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
if (!BKE_layer_collection_move_above(id, lc_dst, lc_src)) {
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
return 0;
}
DEG_relations_tag_update(bmain);
WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
return 1;
}
static int rna_LayerCollection_move_below(ID *id, LayerCollection *lc_src, Main *bmain, LayerCollection *lc_dst)
{
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
if (!BKE_layer_collection_move_below(id, lc_dst, lc_src)) {
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
return 0;
}
DEG_relations_tag_update(bmain);
WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
return 1;
}
static int rna_LayerCollection_move_into(ID *id, LayerCollection *lc_src, Main *bmain, LayerCollection *lc_dst)
{
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
if (!BKE_layer_collection_move_into(id, lc_dst, lc_src)) {
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
return 0;
}
DEG_relations_tag_update(bmain);
WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
return 1;
}
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
static void rna_LayerCollection_flag_update(bContext *C, PointerRNA *ptr)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
ID *id = ptr->id.data;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* TODO(sergey): Use proper flag for tagging here. */
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
DEG_id_tag_update(id, 0);
WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, CTX_data_scene(C));
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
Groups and collection: create group from collection You could still create groups as before, with Ctl + G. This will create a group with a single visible collection. However you can also create a group from an existing collection. Just go to the menu you get in the outliner when clicking in a collection and pick "Create Group". Remember to instance the group afterwards, or link it into a new scene or file. The group and the collection are not kept in sync afterwards. You need to manually edit the group for further changes.
2017-12-01 12:23:05 -02:00
static Group *rna_LayerCollection_create_group(
ID *id, LayerCollection *layer_collection, Main *bmain, bContext *C, ReportList *reports)
{
Group *group;
Scene *scene = (Scene *)id;
SceneCollection *scene_collection = layer_collection->scene_collection;
/* The master collection can't be converted. */
if (scene_collection == BKE_collection_master(&scene->id)) {
BKE_report(reports, RPT_ERROR, "The master collection can't be converted to group");
return NULL;
}
group = BKE_collection_group_create(bmain, scene, layer_collection);
if (group == NULL) {
BKE_reportf(reports, RPT_ERROR, "Failed to convert collection %s", scene_collection->name);
return NULL;
}
DEG_relations_tag_update(bmain);
/* TODO(sergey): Use proper flag for tagging here. */
DEG_id_tag_update(&scene->id, 0);
WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene);
return group;
}
Collections: Operator to duplicate a collection When duplicating a layer collection directly linked to the view layer we copy the collection and link it. For all the not directly linked layer collectionns, we try to sync the layer collection flags, overrides, ... Also we make sure the new collection is right after the original collection. We also expose this in RNA, via collection.duplicate().
2018-02-01 21:11:59 -02:00
static LayerCollection *rna_LayerCollection_duplicate(
ID *id, LayerCollection *layer_collection, Main *bmain, bContext *C, ReportList *reports)
{
if (layer_collection->scene_collection == BKE_collection_master(id)) {
BKE_report(reports, RPT_ERROR, "The master collection can't be duplicated");
return NULL;
}
LayerCollection *layer_collection_new = BKE_layer_collection_duplicate(id, layer_collection);
DEG_relations_tag_update(bmain);
/* Don't use id here, since the layer collection may come from a group. */
WM_event_add_notifier(C, NC_SCENE | ND_LAYER, CTX_data_scene(C));
return layer_collection_new;
}
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
static int rna_LayerCollections_active_collection_index_get(PointerRNA *ptr)
{
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
ViewLayer *view_layer = (ViewLayer *)ptr->data;
return view_layer->active_collection;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
static void rna_LayerCollections_active_collection_index_set(PointerRNA *ptr, int value)
{
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
ViewLayer *view_layer = (ViewLayer *)ptr->data;
int num_collections = BKE_layer_collection_count(view_layer);
view_layer->active_collection = min_ff(value, num_collections - 1);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
static void rna_LayerCollections_active_collection_index_range(
PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax))
{
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
ViewLayer *view_layer = (ViewLayer *)ptr->data;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
*min = 0;
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
*max = max_ii(0, BKE_layer_collection_count(view_layer) - 1);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
static PointerRNA rna_LayerCollections_active_collection_get(PointerRNA *ptr)
{
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
ViewLayer *view_layer = (ViewLayer *)ptr->data;
LayerCollection *lc = BKE_layer_collection_get_active(view_layer);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
return rna_pointer_inherit_refine(ptr, &RNA_LayerCollection, lc);
}
static void rna_LayerCollections_active_collection_set(PointerRNA *ptr, PointerRNA value)
{
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
ViewLayer *view_layer = (ViewLayer *)ptr->data;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
LayerCollection *lc = (LayerCollection *)value.data;
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
const int index = BKE_layer_collection_findindex(view_layer, lc);
if (index != -1) view_layer->active_collection = index;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
LayerCollection * rna_ViewLayer_collection_link(
ID *id, ViewLayer *view_layer, Main *bmain, SceneCollection *sc)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
Scene *scene = (Scene *)id;
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
LayerCollection *lc = BKE_collection_link(view_layer, sc);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
DEG_relations_tag_update(bmain);
/* TODO(sergey): Use proper flag for tagging here. */
DEG_id_tag_update(id, 0);
WM_main_add_notifier(NC_SCENE | ND_LAYER, scene);
return lc;
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static void rna_ViewLayer_collection_unlink(
ID *id, ViewLayer *view_layer, Main *bmain, ReportList *reports, LayerCollection *lc)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
Scene *scene = (Scene *)id;
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
if (BLI_findindex(&view_layer->layer_collections, lc) == -1) {
Cleanup: Use full name for scene_layer in makesrna
2017-11-09 15:32:01 +01:00
BKE_reportf(reports, RPT_ERROR, "Layer collection '%s' is not in '%s'",
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
lc->scene_collection->name, view_layer->name);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
return;
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
BKE_collection_unlink(view_layer, lc);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
DEG_relations_tag_update(bmain);
/* TODO(sergey): Use proper flag for tagging here. */
DEG_id_tag_update(id, 0);
WM_main_add_notifier(NC_SCENE | ND_LAYER | ND_OB_ACTIVE, scene);
}
static PointerRNA rna_LayerObjects_active_object_get(PointerRNA *ptr)
{
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
ViewLayer *view_layer = (ViewLayer *)ptr->data;
return rna_pointer_inherit_refine(ptr, &RNA_Object, view_layer->basact ? view_layer->basact->object : NULL);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
static void rna_LayerObjects_active_object_set(PointerRNA *ptr, PointerRNA value)
{
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
ViewLayer *view_layer = (ViewLayer *)ptr->data;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
if (value.data)
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
view_layer->basact = BKE_view_layer_base_find(view_layer, (Object *)value.data);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
else
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
view_layer->basact = NULL;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 15:20:17 +02:00
static char *rna_ViewLayer_path(PointerRNA *ptr)
{
ViewLayer *srl = (ViewLayer *)ptr->data;
char name_esc[sizeof(srl->name) * 2];
BLI_strescape(name_esc, srl->name, sizeof(name_esc));
return BLI_sprintfN("view_layers[\"%s\"]", name_esc);
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static IDProperty *rna_ViewLayer_idprops(PointerRNA *ptr, bool create)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
ViewLayer *view_layer = (ViewLayer *)ptr->data;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
if (create && !view_layer->id_properties) {
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-16 13:39:25 -02:00
IDPropertyTemplate val = {0};
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
view_layer->id_properties = IDP_New(IDP_GROUP, &val, "ViewLayer ID properties");
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-16 13:39:25 -02:00
}
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
return view_layer->id_properties;
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-16 13:39:25 -02:00
}
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static void rna_ViewLayer_update_render_passes(ID *id)
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-16 13:39:25 -02:00
{
Scene *scene = (Scene *)id;
if (scene->nodetree)
ntreeCompositUpdateRLayers(scene->nodetree);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static PointerRNA rna_ViewLayer_objects_get(CollectionPropertyIterator *iter)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
ListBaseIterator *internal = &iter->internal.listbase;
/* we are actually iterating a ObjectBase list, so override get */
Base *base = (Base *)internal->link;
return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, base->object);
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static int rna_ViewLayer_objects_selected_skip(CollectionPropertyIterator *iter, void *UNUSED(data))
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
ListBaseIterator *internal = &iter->internal.listbase;
Base *base = (Base *)internal->link;
if ((base->flag & BASE_SELECTED) != 0) {
return 0;
}
return 1;
};
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static PointerRNA rna_ViewLayer_depsgraph_get(PointerRNA *ptr)
Depsgraph: Make graph to be per-scene-layer for RNA New access is C.scene.render_layers.active.depsgraph. This will give depsgraph for a given layer. In the future there will need to be some extra context to be passed.
2017-11-03 17:27:13 +01:00
{
Fix wrong attempt to get depsgraph from RNA Groups ViewLayer.
2018-02-01 12:09:22 +01:00
ID *id = ptr->id.data;
if (GS(id->name) == ID_SCE) {
Scene *scene = (Scene *)id;
ViewLayer *view_layer = (ViewLayer *)ptr->data;
Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false);
return rna_pointer_inherit_refine(ptr, &RNA_Depsgraph, depsgraph);
}
return PointerRNA_NULL;
Depsgraph: Make graph to be per-scene-layer for RNA New access is C.scene.render_layers.active.depsgraph. This will give depsgraph for a given layer. In the future there will need to be some extra context to be passed.
2017-11-03 17:27:13 +01:00
}
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
static void rna_LayerObjects_selected_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
ViewLayer *view_layer = (ViewLayer *)ptr->data;
rna_iterator_listbase_begin(iter, &view_layer->object_bases, rna_ViewLayer_objects_selected_skip);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static void rna_ViewLayer_update_tagged(ViewLayer *UNUSED(view_layer), bContext *C)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
Depsgraph *graph = CTX_data_depsgraph(C);
Cleanup: iterator macros - put render iterator in own scope (would shadow it's own variable if used multiple times). - enforce semicolon at end of iterator macros. - no need to typedef one-off macro structs.
2018-03-09 11:44:42 +11:00
DEG_OBJECT_ITER_BEGIN(
graph, ob, DEG_ITER_OBJECT_MODE_VIEWPORT,
DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY |
DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET |
DEG_ITER_OBJECT_FLAG_LINKED_INDIRECTLY |
DEG_ITER_OBJECT_FLAG_VISIBLE |
DEG_ITER_OBJECT_FLAG_DUPLI)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
/* Don't do anything, we just need to run the iterator to flush
* the base info to the objects. */
UNUSED_VARS(ob);
}
Cleanup: iterator macros - put render iterator in own scope (would shadow it's own variable if used multiple times). - enforce semicolon at end of iterator macros. - no need to typedef one-off macro structs.
2018-03-09 11:44:42 +11:00
DEG_OBJECT_ITER_END;
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
static void rna_ObjectBase_select_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
{
Base *base = (Base *)ptr->data;
short mode = (base->flag & BASE_SELECTED) ? BA_SELECT : BA_DESELECT;
ED_object_base_select(base, mode);
}
#else
static void rna_def_scene_collections(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
FunctionRNA *func;
PropertyRNA *parm;
RNA_def_property_srna(cprop, "SceneCollections");
srna = RNA_def_struct(brna, "SceneCollections", NULL);
RNA_def_struct_sdna(srna, "SceneCollection");
RNA_def_struct_ui_text(srna, "Scene Collection", "Collection of scene collections");
func = RNA_def_function(srna, "new", "rna_SceneCollection_new");
RNA_def_function_ui_description(func, "Add a collection to scene");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN);
RNA: scene_collection.collections.new() name optional We already have a fallback naming system when no naming is given, we should use that.
2017-12-28 12:23:37 -02:00
parm = RNA_def_string(func, "name", NULL, 0, "", "New name for the collection (not unique)");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
parm = RNA_def_pointer(func, "result", "SceneCollection", "", "Newly created collection");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "remove", "rna_SceneCollection_remove");
RNA cleanup: Argument names + tooltip for scene_collection.collections.remove()
2017-12-28 12:53:52 -02:00
RNA_def_function_ui_description(func, "Remove a collection and move its objects to the master collection");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN | FUNC_USE_REPORTS);
RNA cleanup: Argument names + tooltip for scene_collection.collections.remove()
2017-12-28 12:53:52 -02:00
parm = RNA_def_pointer(func, "collection", "SceneCollection", "", "Collection to remove");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
}
static void rna_def_collection_objects(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
FunctionRNA *func;
PropertyRNA *parm;
PropertyRNA *prop;
RNA_def_property_srna(cprop, "CollectionObjects");
srna = RNA_def_struct(brna, "CollectionObjects", NULL);
RNA_def_struct_sdna(srna, "SceneCollection");
RNA_def_struct_ui_text(srna, "Collection Objects", "Objects of a collection");
prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_funcs(prop, "rna_SceneCollection_objects_active_index_get",
"rna_SceneCollection_objects_active_index_set",
"rna_SceneCollection_objects_active_index_range");
RNA_def_property_ui_text(prop, "Active Object Index", "Active index in collection objects array");
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, NULL);
func = RNA_def_function(srna, "link", "rna_SceneCollection_object_link");
RNA_def_function_ui_description(func, "Link an object to collection");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN | FUNC_USE_REPORTS);
parm = RNA_def_pointer(func, "object", "Object", "", "Object to add to collection");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
func = RNA_def_function(srna, "unlink", "rna_SceneCollection_object_unlink");
RNA_def_function_ui_description(func, "Unlink object from collection");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN | FUNC_USE_REPORTS);
parm = RNA_def_pointer(func, "object", "Object", "", "Object to remove from collection");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
}
static void rna_def_scene_collection(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
FunctionRNA *func;
PropertyRNA *parm;
srna = RNA_def_struct(brna, "SceneCollection", NULL);
RNA_def_struct_ui_text(srna, "Scene Collection", "Collection");
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 15:20:17 +02:00
RNA_def_struct_ui_icon(srna, ICON_COLLAPSEMENU);
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
RNA_def_struct_refine_func(srna, "rna_SceneCollection_refine");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SceneCollection_name_set");
RNA_def_property_ui_text(prop, "Name", "Collection name");
RNA_def_struct_name_property(srna, prop);
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, NULL);
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01 11:24:21 -02:00
prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, rna_enum_collection_type_items);
RNA_def_property_ui_text(prop, "Type", "Type of collection");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "collections", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "scene_collections", NULL);
RNA_def_property_struct_type(prop, "SceneCollection");
RNA_def_property_ui_text(prop, "SceneCollections", "");
rna_def_scene_collections(brna, prop);
prop = RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "objects", NULL);
RNA_def_property_struct_type(prop, "Object");
RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, "rna_SceneCollection_objects_get", NULL, NULL, NULL, NULL);
RNA_def_property_ui_text(prop, "Objects", "All the objects directly added to this collection (not including sub-collection objects)");
rna_def_collection_objects(brna, prop);
/* Functions */
func = RNA_def_function(srna, "move_above", "rna_SceneCollection_move_above");
RNA_def_function_ui_description(func, "Move collection after another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN);
parm = RNA_def_pointer(func, "sc_dst", "SceneCollection", "Collection", "Reference collection above which the collection will move");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "move_below", "rna_SceneCollection_move_below");
RNA_def_function_ui_description(func, "Move collection before another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN);
parm = RNA_def_pointer(func, "sc_dst", "SceneCollection", "Collection", "Reference collection below which the collection will move");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "move_into", "rna_SceneCollection_move_into");
RNA_def_function_ui_description(func, "Move collection into another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN);
parm = RNA_def_pointer(func, "sc_dst", "SceneCollection", "Collection", "Collection to insert into");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
Collections: Operator to duplicate a collection When duplicating a layer collection directly linked to the view layer we copy the collection and link it. For all the not directly linked layer collectionns, we try to sync the layer collection flags, overrides, ... Also we make sure the new collection is right after the original collection. We also expose this in RNA, via collection.duplicate().
2018-02-01 21:11:59 -02:00
func = RNA_def_function(srna, "duplicate", "rna_SceneCollection_duplicate");
RNA_def_function_ui_description(func, "Create a copy of the collection");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN | FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
parm = RNA_def_pointer(func, "result", "SceneCollection", "", "Newly created collection");
RNA_def_function_return(func, parm);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
}
static void rna_def_layer_collection_override(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
srna = RNA_def_struct(brna, "LayerCollectionOverride", NULL);
RNA_def_struct_sdna(srna, "CollectionOverride");
RNA_def_struct_ui_text(srna, "Collection Override", "Collection Override");
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(prop, "Name", "Collection name");
RNA_def_struct_name_property(srna, prop);
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, NULL);
}
#ifdef WITH_CLAY_ENGINE
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static void rna_def_view_layer_engine_settings_clay(BlenderRNA *brna)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
StructRNA *srna;
PropertyRNA *prop;
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
srna = RNA_def_struct(brna, "ViewLayerEngineSettingsClay", "ViewLayerSettings");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_struct_ui_text(srna, "Clay Scene Layer Settings", "Clay Engine settings");
RNA_define_verify_sdna(0); /* not in sdna */
/* see RNA_LAYER_ENGINE_GET_SET macro */
prop = RNA_def_property(srna, "ssao_samples", PROP_INT, PROP_NONE);
RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Clay_ssao_samples_get",
"rna_LayerEngineSettings_Clay_ssao_samples_set", NULL);
RNA_def_property_ui_text(prop, "Samples", "Number of samples");
RNA_def_property_range(prop, 1, 500);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_define_verify_sdna(1); /* not in sdna */
}
#endif /* WITH_CLAY_ENGINE */
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static void rna_def_view_layer_engine_settings_eevee(BlenderRNA *brna)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
StructRNA *srna;
PropertyRNA *prop;
/* Keep in sync with eevee_private.h */
static const EnumPropertyItem eevee_shadow_method_items[] = {
{1, "ESM", 0, "ESM", "Exponential Shadow Mapping"},
{2, "VSM", 0, "VSM", "Variance Shadow Mapping"},
{0, NULL, 0, NULL, NULL}
};
static const EnumPropertyItem eevee_shadow_size_items[] = {
{64, "64", 0, "64px", ""},
{128, "128", 0, "128px", ""},
{256, "256", 0, "256px", ""},
{512, "512", 0, "512px", ""},
{1024, "1024", 0, "1024px", ""},
{2048, "2048", 0, "2048px", ""},
{4096, "4096", 0, "4096px", ""},
{0, NULL, 0, NULL, NULL}
};
Eevee: Irradiance Visibility: Add RNA / Engine properties
2017-12-02 13:01:40 +01:00
static const EnumPropertyItem eevee_gi_visibility_size_items[] = {
{8, "8", 0, "8px", ""},
{16, "16", 0, "16px", ""},
{32, "32", 0, "32px", ""},
{64, "64", 0, "64px", ""},
{0, NULL, 0, NULL, NULL}
};
Eevee: Overhaul the volumetric system. The system now uses several 3D textures in order to decouple every steps of the volumetric rendering. See https://www.ea.com/frostbite/news/physically-based-unified-volumetric-rendering-in-frostbite for more details. On the technical side, instead of using a compute shader to populate the 3D textures we use layered rendering with a geometry shader to render 1 fullscreen triangle per 3D texture slice.
2017-10-24 14:49:00 +02:00
static const EnumPropertyItem eevee_volumetric_tile_size_items[] = {
{2, "2", 0, "2px", ""},
{4, "4", 0, "4px", ""},
{8, "8", 0, "8px", ""},
{16, "16", 0, "16px", ""},
{0, NULL, 0, NULL, NULL}
};
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
srna = RNA_def_struct(brna, "ViewLayerEngineSettingsEevee", "ViewLayerSettings");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_struct_ui_text(srna, "Eevee Scene Layer Settings", "Eevee Engine settings");
RNA_define_verify_sdna(0); /* not in sdna */
/* see RNA_LAYER_ENGINE_GET_SET macro */
/* Indirect Lighting */
prop = RNA_def_property(srna, "gi_diffuse_bounces", PROP_INT, PROP_NONE);
RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_gi_diffuse_bounces_get",
"rna_LayerEngineSettings_Eevee_gi_diffuse_bounces_set", NULL);
RNA_def_property_ui_text(prop, "Diffuse Bounces", "Number of time the light is reinjected inside light grids, "
"0 disable indirect diffuse light");
RNA_def_property_range(prop, 0, INT_MAX);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "gi_cubemap_resolution", PROP_ENUM, PROP_NONE);
Eevee: Irradiance Visibility: Add RNA / Engine properties
2017-12-02 13:01:40 +01:00
RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Eevee_gi_cubemap_resolution_get",
"rna_LayerEngineSettings_Eevee_gi_cubemap_resolution_set", NULL);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_enum_items(prop, eevee_shadow_size_items);
RNA_def_property_ui_text(prop, "Cubemap Size", "Size of every cubemaps");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
Eevee: Irradiance Visibility: Add RNA / Engine properties
2017-12-02 13:01:40 +01:00
prop = RNA_def_property(srna, "gi_visibility_resolution", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Eevee_gi_visibility_resolution_get",
"rna_LayerEngineSettings_Eevee_gi_visibility_resolution_set", NULL);
RNA_def_property_enum_items(prop, eevee_gi_visibility_size_items);
RNA_def_property_ui_text(prop, "Irradiance Visibility Size",
"Size of the shadow map applied to each irradiance sample");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Temporal Anti-Aliasing (super sampling) */
prop = RNA_def_property(srna, "taa_samples", PROP_INT, PROP_NONE);
RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_taa_samples_get",
"rna_LayerEngineSettings_Eevee_taa_samples_set", NULL);
Eevee: Add new "render samples" properties.
2018-01-29 19:39:07 +01:00
RNA_def_property_ui_text(prop, "Viewport Samples", "Number of samples, unlimited if 0");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_range(prop, 0, INT_MAX);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
Eevee: Add new "render samples" properties.
2018-01-29 19:39:07 +01:00
prop = RNA_def_property(srna, "taa_render_samples", PROP_INT, PROP_NONE);
RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_taa_render_samples_get",
"rna_LayerEngineSettings_Eevee_taa_render_samples_set", NULL);
RNA_def_property_ui_text(prop, "Render Samples", "Number of samples per pixels for rendering");
RNA_def_property_range(prop, 1, INT_MAX);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Eevee: TAA Reprojection: Add layer property.
2018-04-20 18:20:39 +02:00
prop = RNA_def_property(srna, "taa_reprojection", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_taa_reprojection_get",
"rna_LayerEngineSettings_Eevee_taa_reprojection_set");
RNA_def_property_ui_text(prop, "Viewport Denoising", "Denoise image using temporal reprojection "
"(can leave some ghosting)");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Eevee: Add new "render samples" properties.
2018-01-29 19:39:07 +01:00
Eevee: Initial Separable Subsurface Scattering implementation. How to use: - Enable subsurface scattering in the render options. - Add Subsurface BSDF to your shader. - Check "Screen Space Subsurface Scattering" in the material panel options. This initial implementation has a few limitations: - only supports gaussian SSS. - Does not support principled shader. - The radius parameters is baked down to a number of samples and then put into an UBO. This means the radius input socket cannot be used. You need to tweak the default vector directly. - The "texture blur" is considered as always set to 1
2017-11-14 00:49:54 +01:00
/* Screen Space Subsurface Scattering */
prop = RNA_def_property(srna, "sss_enable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_sss_enable_get",
"rna_LayerEngineSettings_Eevee_sss_enable_set");
RNA_def_property_ui_text(prop, "Subsurface Scattering", "Enable screen space subsurface scattering");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Eevee: Initial Separable Subsurface Scattering implementation. How to use: - Enable subsurface scattering in the render options. - Add Subsurface BSDF to your shader. - Check "Screen Space Subsurface Scattering" in the material panel options. This initial implementation has a few limitations: - only supports gaussian SSS. - Does not support principled shader. - The radius parameters is baked down to a number of samples and then put into an UBO. This means the radius input socket cannot be used. You need to tweak the default vector directly. - The "texture blur" is considered as always set to 1
2017-11-14 00:49:54 +01:00
Eevee: SSS: Add Quality settings. Samples : pretty self explanatory. Jitter Threshold : Reduce cache misses and improve performance (greatly) by lowering this value. This settings let user decide how many samples should be jittered (rotated) to reduce banding artifacts.
2017-11-14 02:17:34 +01:00
prop = RNA_def_property(srna, "sss_samples", PROP_INT, PROP_NONE);
RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_sss_samples_get",
"rna_LayerEngineSettings_Eevee_sss_samples_set", NULL);
RNA_def_property_ui_text(prop, "Samples", "Number of samples to compute the scattering effect");
RNA_def_property_range(prop, 1, 32);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Eevee: SSS: Add Quality settings. Samples : pretty self explanatory. Jitter Threshold : Reduce cache misses and improve performance (greatly) by lowering this value. This settings let user decide how many samples should be jittered (rotated) to reduce banding artifacts.
2017-11-14 02:17:34 +01:00
prop = RNA_def_property(srna, "sss_jitter_threshold", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_sss_jitter_threshold_get",
"rna_LayerEngineSettings_Eevee_sss_jitter_threshold_set", NULL);
RNA_def_property_ui_text(prop, "Jitter Threshold", "Rotate samples that are below this threshold");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Eevee: SSS: Add separated Albedo option. This option prevent from automatically blurring the albedo color applied to the SSS. While this is great for preserving details it can bleed more light onto the nearby objects since the blurring will be done on pure "white" irradiance. This issue is to be tackled in a separate commit.
2017-11-24 22:29:18 +01:00
prop = RNA_def_property(srna, "sss_separate_albedo", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_sss_separate_albedo_get",
"rna_LayerEngineSettings_Eevee_sss_separate_albedo_set");
RNA_def_property_ui_text(prop, "Separate Albedo", "Avoid albedo being blured by the subsurface scattering "
"but uses more video memory");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Eevee: SSS: Add Quality settings. Samples : pretty self explanatory. Jitter Threshold : Reduce cache misses and improve performance (greatly) by lowering this value. This settings let user decide how many samples should be jittered (rotated) to reduce banding artifacts.
2017-11-14 02:17:34 +01:00
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Screen Space Reflection */
prop = RNA_def_property(srna, "ssr_enable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_enable_get",
"rna_LayerEngineSettings_Eevee_ssr_enable_set");
RNA_def_property_ui_text(prop, "Screen Space Reflections", "Enable screen space reflection");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssr_refraction", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_refraction_get",
"rna_LayerEngineSettings_Eevee_ssr_refraction_set");
RNA_def_property_ui_text(prop, "Screen Space Refractions", "Enable screen space Refractions");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssr_halfres", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_halfres_get",
"rna_LayerEngineSettings_Eevee_ssr_halfres_set");
RNA_def_property_ui_text(prop, "Half Res Trace", "Raytrace at a lower resolution");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssr_quality", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_quality_get",
"rna_LayerEngineSettings_Eevee_ssr_quality_set", NULL);
RNA_def_property_ui_text(prop, "Trace Quality", "Quality of the screen space raytracing");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssr_max_roughness", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_max_roughness_get",
"rna_LayerEngineSettings_Eevee_ssr_max_roughness_set", NULL);
RNA_def_property_ui_text(prop, "Max Roughness", "Do not raytrace reflections for roughness above this value");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssr_thickness", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_thickness_get",
"rna_LayerEngineSettings_Eevee_ssr_thickness_set", NULL);
RNA_def_property_ui_text(prop, "Thickness", "Pixel thickness used to detect intersection");
RNA_def_property_range(prop, 1e-6f, FLT_MAX);
RNA_def_property_ui_range(prop, 0.001f, FLT_MAX, 5, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssr_border_fade", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_border_fade_get",
"rna_LayerEngineSettings_Eevee_ssr_border_fade_set", NULL);
RNA_def_property_ui_text(prop, "Edge Fading", "Screen percentage used to fade the SSR");
RNA_def_property_range(prop, 0.0f, 0.5f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssr_firefly_fac", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_firefly_fac_get",
"rna_LayerEngineSettings_Eevee_ssr_firefly_fac_set", NULL);
RNA_def_property_ui_text(prop, "Clamp", "Clamp pixel intensity to remove noise (0 to disabled)");
RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Volumetrics */
prop = RNA_def_property(srna, "volumetric_enable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_enable_get",
"rna_LayerEngineSettings_Eevee_volumetric_enable_set");
RNA_def_property_ui_text(prop, "Volumetrics", "Enable scattering and absorbance of volumetric material");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "volumetric_start", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_start_get",
"rna_LayerEngineSettings_Eevee_volumetric_start_set", NULL);
RNA_def_property_ui_text(prop, "Start", "Start distance of the volumetric effect");
RNA_def_property_range(prop, 1e-6f, FLT_MAX);
RNA_def_property_ui_range(prop, 0.001f, FLT_MAX, 10, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "volumetric_end", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_end_get",
"rna_LayerEngineSettings_Eevee_volumetric_end_set", NULL);
RNA_def_property_ui_text(prop, "End", "End distance of the volumetric effect");
RNA_def_property_range(prop, 1e-6f, FLT_MAX);
RNA_def_property_ui_range(prop, 0.001f, FLT_MAX, 10, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Eevee: Overhaul the volumetric system. The system now uses several 3D textures in order to decouple every steps of the volumetric rendering. See https://www.ea.com/frostbite/news/physically-based-unified-volumetric-rendering-in-frostbite for more details. On the technical side, instead of using a compute shader to populate the 3D textures we use layered rendering with a geometry shader to render 1 fullscreen triangle per 3D texture slice.
2017-10-24 14:49:00 +02:00
prop = RNA_def_property(srna, "volumetric_tile_size", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_tile_size_get",
"rna_LayerEngineSettings_Eevee_volumetric_tile_size_set", NULL);
RNA_def_property_enum_items(prop, eevee_volumetric_tile_size_items);
Eevee: Volumetrics: Fix "Tile Size" tooltip
2017-10-27 22:36:15 +02:00
RNA_def_property_ui_text(prop, "Tile Size", "Control the quality of the volumetric effects "
"(lower size increase vram usage and quality)");
Eevee: Overhaul the volumetric system. The system now uses several 3D textures in order to decouple every steps of the volumetric rendering. See https://www.ea.com/frostbite/news/physically-based-unified-volumetric-rendering-in-frostbite for more details. On the technical side, instead of using a compute shader to populate the 3D textures we use layered rendering with a geometry shader to render 1 fullscreen triangle per 3D texture slice.
2017-10-24 14:49:00 +02:00
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "volumetric_samples", PROP_INT, PROP_NONE);
RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_samples_get",
"rna_LayerEngineSettings_Eevee_volumetric_samples_set", NULL);
RNA_def_property_ui_text(prop, "Samples", "Number of samples to compute volumetric effects");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_range(prop, 1, 256);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "volumetric_sample_distribution", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_sample_distribution_get",
"rna_LayerEngineSettings_Eevee_volumetric_sample_distribution_set", NULL);
RNA_def_property_ui_text(prop, "Exponential Sampling", "Distribute more samples closer to the camera");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "volumetric_lights", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_lights_get",
"rna_LayerEngineSettings_Eevee_volumetric_lights_set");
RNA_def_property_ui_text(prop, "Volumetric Lighting", "Enable scene lamps interactions with volumetrics");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "volumetric_light_clamp", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_light_clamp_get",
"rna_LayerEngineSettings_Eevee_volumetric_light_clamp_set", NULL);
RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_ui_text(prop, "Clamp", "Maximum light contribution, reducing noise");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "volumetric_shadows", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_shadows_get",
"rna_LayerEngineSettings_Eevee_volumetric_shadows_set");
RNA_def_property_ui_text(prop, "Volumetric Shadows", "Generate shadows from volumetric material (Very expensive)");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "volumetric_shadow_samples", PROP_INT, PROP_NONE);
RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_shadow_samples_get",
"rna_LayerEngineSettings_Eevee_volumetric_shadow_samples_set", NULL);
RNA_def_property_range(prop, 1, 128);
RNA_def_property_ui_text(prop, "Volumetric Shadow Samples", "Number of samples to compute volumetric shadowing");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "volumetric_colored_transmittance", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_colored_transmittance_get",
"rna_LayerEngineSettings_Eevee_volumetric_colored_transmittance_set");
RNA_def_property_ui_text(prop, "Colored Transmittance", "Enable wavelength dependent volumetric transmittance");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Ambient Occlusion */
prop = RNA_def_property(srna, "gtao_enable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_enable_get",
"rna_LayerEngineSettings_Eevee_gtao_enable_set");
RNA_def_property_ui_text(prop, "Ambient Occlusion", "Enable ambient occlusion to simulate medium scale indirect shadowing");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "gtao_use_bent_normals", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_use_bent_normals_get",
"rna_LayerEngineSettings_Eevee_gtao_use_bent_normals_set");
RNA_def_property_ui_text(prop, "Bent Normals", "Compute main non occluded direction to sample the environment");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "gtao_bounce", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_bounce_get",
"rna_LayerEngineSettings_Eevee_gtao_bounce_set");
RNA_def_property_ui_text(prop, "Bounces Approximation", "An approximation to simulate light bounces "
"giving less occlusion on brighter objects");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "gtao_factor", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_factor_get", "rna_LayerEngineSettings_Eevee_gtao_factor_set", NULL);
RNA_def_property_ui_text(prop, "Factor", "Factor for ambient occlusion blending");
RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1f, 2);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "gtao_quality", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_quality_get", "rna_LayerEngineSettings_Eevee_gtao_quality_set", NULL);
RNA_def_property_ui_text(prop, "Trace Quality", "Quality of the horizon search");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "gtao_distance", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_distance_get", "rna_LayerEngineSettings_Eevee_gtao_distance_set", NULL);
RNA_def_property_ui_text(prop, "Distance", "Distance of object that contribute to the ambient occlusion effect");
RNA_def_property_range(prop, 0.0f, 100000.0f);
RNA_def_property_ui_range(prop, 0.0f, 100.0f, 1, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Depth of Field */
prop = RNA_def_property(srna, "dof_enable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_dof_enable_get",
"rna_LayerEngineSettings_Eevee_dof_enable_set");
RNA_def_property_ui_text(prop, "Depth of Field", "Enable depth of field using the values from the active camera");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "bokeh_max_size", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bokeh_max_size_get",
"rna_LayerEngineSettings_Eevee_bokeh_max_size_set", NULL);
RNA_def_property_ui_text(prop, "Max Size", "Max size of the bokeh shape for the depth of field (lower is faster)");
RNA_def_property_range(prop, 0.0f, 2000.0f);
RNA_def_property_ui_range(prop, 2.0f, 200.0f, 1, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "bokeh_threshold", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bokeh_threshold_get",
"rna_LayerEngineSettings_Eevee_bokeh_threshold_set", NULL);
RNA_def_property_ui_text(prop, "Sprite Threshold", "Brightness threshold for using sprite base depth of field");
RNA_def_property_range(prop, 0.0f, 100000.0f);
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Bloom */
prop = RNA_def_property(srna, "bloom_enable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_enable_get",
"rna_LayerEngineSettings_Eevee_bloom_enable_set");
RNA_def_property_ui_text(prop, "Bloom", "High brighness pixels generate a glowing effect");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "bloom_threshold", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_threshold_get",
"rna_LayerEngineSettings_Eevee_bloom_threshold_set", NULL);
RNA_def_property_ui_text(prop, "Threshold", "Filters out pixels under this level of brightness");
RNA_def_property_range(prop, 0.0f, 100000.0f);
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "bloom_color", PROP_FLOAT, PROP_COLOR);
RNA_def_property_array(prop, 3);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_color_get",
"rna_LayerEngineSettings_Eevee_bloom_color_set", NULL);
RNA_def_property_ui_text(prop, "Color", "Color applied to the bloom effect");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "bloom_knee", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_knee_get",
"rna_LayerEngineSettings_Eevee_bloom_knee_set", NULL);
RNA_def_property_ui_text(prop, "Knee", "Makes transition between under/over-threshold gradual");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "bloom_radius", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_radius_get",
"rna_LayerEngineSettings_Eevee_bloom_radius_set", NULL);
RNA_def_property_ui_text(prop, "Radius", "Bloom spread distance");
RNA_def_property_range(prop, 0.0f, 100.0f);
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "bloom_clamp", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_clamp_get",
"rna_LayerEngineSettings_Eevee_bloom_clamp_set", NULL);
RNA_def_property_ui_text(prop, "Clamp", "Maximum intensity a bloom pixel can have");
RNA_def_property_range(prop, 0.0f, 1000.0f);
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "bloom_intensity", PROP_FLOAT, PROP_UNSIGNED);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_intensity_get",
"rna_LayerEngineSettings_Eevee_bloom_intensity_set", NULL);
RNA_def_property_ui_text(prop, "Intensity", "Blend factor");
RNA_def_property_range(prop, 0.0f, 10000.0f);
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Motion blur */
prop = RNA_def_property(srna, "motion_blur_enable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_motion_blur_enable_get",
"rna_LayerEngineSettings_Eevee_motion_blur_enable_set");
RNA_def_property_ui_text(prop, "Motion Blur", "Enable motion blur effect (only in camera view)");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "motion_blur_samples", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_motion_blur_samples_get",
"rna_LayerEngineSettings_Eevee_motion_blur_samples_set", NULL);
RNA_def_property_ui_text(prop, "Samples", "Number of samples to take with motion blur");
RNA_def_property_range(prop, 1, 64);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "motion_blur_shutter", PROP_FLOAT, PROP_UNSIGNED);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_motion_blur_shutter_get",
"rna_LayerEngineSettings_Eevee_motion_blur_shutter_set", NULL);
RNA_def_property_ui_text(prop, "Shutter", "Time taken in frames between shutter open and close");
RNA_def_property_ui_range(prop, 0.01f, 2.0f, 1, 2);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Shadows */
prop = RNA_def_property(srna, "shadow_method", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Eevee_shadow_method_get", "rna_LayerEngineSettings_Eevee_shadow_method_set", NULL);
RNA_def_property_enum_items(prop, eevee_shadow_method_items);
RNA_def_property_ui_text(prop, "Method", "Technique use to compute the shadows");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
Eevee: Shadows: Separate Cube and Cascade shadow maps into 2 texture array. This mean we can now have different shadow resolutions for both. However each shadow type keep the same size accross all lamps because of future "real" Cube Shadowmaps limitation and to save texture sampler slots. That said the cascade shadow resolution could (in the future) still be changed to be adjustable per sun lamp.
2018-05-04 14:39:05 +02:00
prop = RNA_def_property(srna, "shadow_cube_size", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Eevee_shadow_cube_size_get", "rna_LayerEngineSettings_Eevee_shadow_cube_size_set", NULL);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_enum_items(prop, eevee_shadow_size_items);
Eevee: Shadows: Separate Cube and Cascade shadow maps into 2 texture array. This mean we can now have different shadow resolutions for both. However each shadow type keep the same size accross all lamps because of future "real" Cube Shadowmaps limitation and to save texture sampler slots. That said the cascade shadow resolution could (in the future) still be changed to be adjustable per sun lamp.
2018-05-04 14:39:05 +02:00
RNA_def_property_ui_text(prop, "Cube Shadows Resolution", "Size of point and area lamps shadow maps");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
prop = RNA_def_property(srna, "shadow_cascade_size", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Eevee_shadow_cascade_size_get", "rna_LayerEngineSettings_Eevee_shadow_cascade_size_set", NULL);
RNA_def_property_enum_items(prop, eevee_shadow_size_items);
RNA_def_property_ui_text(prop, "Directional Shadows Resolution", "Size of sun lamps shadow maps");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "shadow_high_bitdepth", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_shadow_high_bitdepth_get", "rna_LayerEngineSettings_Eevee_shadow_high_bitdepth_set");
RNA_def_property_ui_text(prop, "High Bitdepth", "Use 32bit shadows");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_define_verify_sdna(1); /* not in sdna */
}
#ifdef WITH_CLAY_ENGINE
static void rna_def_layer_collection_engine_settings_clay(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
static const EnumPropertyItem clay_matcap_items[] = {
{ICON_MATCAP_01, "01", ICON_MATCAP_01, "", ""},
{ICON_MATCAP_02, "02", ICON_MATCAP_02, "", ""},
{ICON_MATCAP_03, "03", ICON_MATCAP_03, "", ""},
{ICON_MATCAP_04, "04", ICON_MATCAP_04, "", ""},
{ICON_MATCAP_05, "05", ICON_MATCAP_05, "", ""},
{ICON_MATCAP_06, "06", ICON_MATCAP_06, "", ""},
{ICON_MATCAP_07, "07", ICON_MATCAP_07, "", ""},
{ICON_MATCAP_08, "08", ICON_MATCAP_08, "", ""},
{ICON_MATCAP_09, "09", ICON_MATCAP_09, "", ""},
{ICON_MATCAP_10, "10", ICON_MATCAP_10, "", ""},
{ICON_MATCAP_11, "11", ICON_MATCAP_11, "", ""},
{ICON_MATCAP_12, "12", ICON_MATCAP_12, "", ""},
{ICON_MATCAP_13, "13", ICON_MATCAP_13, "", ""},
{ICON_MATCAP_14, "14", ICON_MATCAP_14, "", ""},
{ICON_MATCAP_15, "15", ICON_MATCAP_15, "", ""},
{ICON_MATCAP_16, "16", ICON_MATCAP_16, "", ""},
{ICON_MATCAP_17, "17", ICON_MATCAP_17, "", ""},
{ICON_MATCAP_18, "18", ICON_MATCAP_18, "", ""},
{ICON_MATCAP_19, "19", ICON_MATCAP_19, "", ""},
{ICON_MATCAP_20, "20", ICON_MATCAP_20, "", ""},
{ICON_MATCAP_21, "21", ICON_MATCAP_21, "", ""},
{ICON_MATCAP_22, "22", ICON_MATCAP_22, "", ""},
{ICON_MATCAP_23, "23", ICON_MATCAP_23, "", ""},
{ICON_MATCAP_24, "24", ICON_MATCAP_24, "", ""},
{0, NULL, 0, NULL, NULL}
};
srna = RNA_def_struct(brna, "LayerCollectionEngineSettingsClay", "LayerCollectionSettings");
RNA_def_struct_ui_text(srna, "Collections Clay Engine Settings", "Engine specific settings for this collection");
RNA_define_verify_sdna(0); /* not in sdna */
/* see RNA_LAYER_ENGINE_GET_SET macro */
prop = RNA_def_property(srna, "matcap_icon", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Clay_matcap_icon_get", "rna_LayerEngineSettings_Clay_matcap_icon_set", NULL);
RNA_def_property_enum_items(prop, clay_matcap_items);
RNA_def_property_ui_text(prop, "Matcap", "Image to use for Material Capture by this material");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "matcap_rotation", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Clay_matcap_rotation_get", "rna_LayerEngineSettings_Clay_matcap_rotation_set", NULL);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Matcap Rotation", "Orientation of the matcap on the model");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "matcap_hue", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Clay_matcap_hue_get", "rna_LayerEngineSettings_Clay_matcap_hue_set", NULL);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Matcap Hue Shift", "Hue correction of the matcap");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "matcap_saturation", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Clay_matcap_saturation_get", "rna_LayerEngineSettings_Clay_matcap_saturation_set", NULL);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Matcap Saturation", "Saturation correction of the matcap");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "matcap_value", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Clay_matcap_value_get", "rna_LayerEngineSettings_Clay_matcap_value_set", NULL);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Matcap Value", "Value correction of the matcap");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssao_factor_cavity", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Clay_ssao_factor_cavity_get", "rna_LayerEngineSettings_Clay_ssao_factor_cavity_set", NULL);
RNA_def_property_ui_text(prop, "Cavity Strength", "Strength of the Cavity effect");
RNA_def_property_range(prop, 0.0f, 250.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssao_factor_edge", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Clay_ssao_factor_edge_get", "rna_LayerEngineSettings_Clay_ssao_factor_edge_set", NULL);
RNA_def_property_ui_text(prop, "Edge Strength", "Strength of the Edge effect");
RNA_def_property_range(prop, 0.0f, 250.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssao_distance", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Clay_ssao_distance_get", "rna_LayerEngineSettings_Clay_ssao_distance_set", NULL);
RNA_def_property_ui_text(prop, "Distance", "Distance of object that contribute to the Cavity/Edge effect");
RNA_def_property_range(prop, 0.0f, 100000.0f);
RNA_def_property_ui_range(prop, 0.0f, 100.0f, 1, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "ssao_attenuation", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Clay_ssao_attenuation_get", "rna_LayerEngineSettings_Clay_ssao_attenuation_set", NULL);
RNA_def_property_ui_text(prop, "Attenuation", "Attenuation constant");
RNA_def_property_range(prop, 1.0f, 100000.0f);
RNA_def_property_ui_range(prop, 1.0f, 100.0f, 1, 3);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "hair_brightness_randomness", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Clay_hair_brightness_randomness_get", "rna_LayerEngineSettings_Clay_hair_brightness_randomness_set", NULL);
RNA_def_property_ui_text(prop, "Hair Brightness Randomness", "Brightness randomness for hair");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Fix update of non-scene owned layer collections We are using NC_SCENE | ND_LAYER_CONTENT for the shader, however this does not work for groups unless we manually handle the notifiers. Otherwise the group id is passed, and the listener never gets the notification since a scene id is expected, or no id at all.
2017-12-01 11:24:06 -02:00
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_define_verify_sdna(1); /* not in sdna */
}
#endif /* WITH_CLAY_ENGINE */
Workbench: Option to use Object color - added `object_color_type` where the user can set if the collection determines the color, or the object will be used for the color. Implemented it as an enum as later this can have a random color option. - moved OB_LIGHTING_* to DNA_view3d_types and renamed it. - Fixed some DRY in workbench_materials.c. Can remove more DRY's but will need to discuss the responsibility of the workbench engine as it might become part of the eevee renderer.
2018-04-19 09:45:52 +02:00
/* Workbench engine */
Workbench: Added studio lighting to view layer
2018-04-25 15:59:15 +02:00
static void rna_def_view_layer_engine_settings_workbench(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
srna = RNA_def_struct(brna, "ViewLayerEngineSettingsWorkbench", "ViewLayerSettings");
RNA_def_struct_ui_text(srna, "Workbench Scene Layer Settings", "Workbench Engine settings");
RNA_define_verify_sdna(0); /* not in sdna */
Workbench: Shadows Initial review of the shard shadows in the workbench engine. Speed optimizations like transform feedback are not implemented yet. I first want this part to be reviewed and merged. @fclem please check the note in drw_stencil_set it was holding back nequal == 0 as by default DST.stencil_mask was set to 0. questioin is should we remove the whole check or not. Also I am still looking for a better name (or split the enum) for DRW_STATE_STENCIL_DEPTH_FAIL_INCR_DECR_WRAP Reviewers: fclem Reviewed By: fclem Tags: #code_quest Differential Revision: https://developer.blender.org/D3198
2018-05-04 14:07:00 +02:00
prop = RNA_def_property(srna, "light_direction", PROP_FLOAT, PROP_DIRECTION);
Workbench: Added studio lighting to view layer
2018-04-25 15:59:15 +02:00
RNA_def_property_array(prop, 3);
Workbench: Shadows Initial review of the shard shadows in the workbench engine. Speed optimizations like transform feedback are not implemented yet. I first want this part to be reviewed and merged. @fclem please check the note in drw_stencil_set it was holding back nequal == 0 as by default DST.stencil_mask was set to 0. questioin is should we remove the whole check or not. Also I am still looking for a better name (or split the enum) for DRW_STATE_STENCIL_DEPTH_FAIL_INCR_DECR_WRAP Reviewers: fclem Reviewed By: fclem Tags: #code_quest Differential Revision: https://developer.blender.org/D3198
2018-05-04 14:07:00 +02:00
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Workbench_light_direction_get", "rna_LayerEngineSettings_Workbench_light_direction_set", NULL);
RNA_def_property_ui_text(prop, "Light Direction", "Direction of the light for shadow calculation");
Workbench: Added studio lighting to view layer
2018-04-25 15:59:15 +02:00
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update");
RNA_define_verify_sdna(1); /* not in sdna */
}
Workbench: Added Object Color to collection_properties
2018-04-16 15:01:31 +02:00
static void rna_def_layer_collection_engine_settings_workbench(BlenderRNA *brna)
{
StructRNA *srna;
Silhouette Overlap Overlay Added Object Overlap Overlay - Added R32UI support to GPU_framebuffer - Added R32U support to draw manager - The overlay mode has a object data pass that will render 'needed' data to specific buffers so we can mix them together via a deferred rendering. In future will also add UV's and other data - Overlap is implemented as an overlay so it could be used on top of the Scene lighted Solid mode (that will be rendered by Eevee. Reviewers: fclem, brecht Reviewed By: fclem Subscribers: sergey Tags: #code_quest Maniphest Tasks: T54726 Differential Revision: https://developer.blender.org/D3174
2018-04-25 10:59:48 +02:00
PropertyRNA *prop;
Workbench: Option to use Object color - added `object_color_type` where the user can set if the collection determines the color, or the object will be used for the color. Implemented it as an enum as later this can have a random color option. - moved OB_LIGHTING_* to DNA_view3d_types and renamed it. - Fixed some DRY in workbench_materials.c. Can remove more DRY's but will need to discuss the responsibility of the workbench engine as it might become part of the eevee renderer.
2018-04-19 09:45:52 +02:00
Workbench: Added Object Color to collection_properties
2018-04-16 15:01:31 +02:00
srna = RNA_def_struct(brna, "LayerCollectionEngineSettingsWorkbench", "LayerCollectionSettings");
Workbench: Option to use Object color - added `object_color_type` where the user can set if the collection determines the color, or the object will be used for the color. Implemented it as an enum as later this can have a random color option. - moved OB_LIGHTING_* to DNA_view3d_types and renamed it. - Fixed some DRY in workbench_materials.c. Can remove more DRY's but will need to discuss the responsibility of the workbench engine as it might become part of the eevee renderer.
2018-04-19 09:45:52 +02:00
RNA_def_struct_ui_text(srna, "Collections Workbench Engine Settings", "Workbench specific settings for this collection");
Workbench: Added Object Color to collection_properties
2018-04-16 15:01:31 +02:00
RNA_define_verify_sdna(0); /* not in sdna */
Silhouette Overlap Overlay Added Object Overlap Overlay - Added R32UI support to GPU_framebuffer - Added R32U support to draw manager - The overlay mode has a object data pass that will render 'needed' data to specific buffers so we can mix them together via a deferred rendering. In future will also add UV's and other data - Overlap is implemented as an overlay so it could be used on top of the Scene lighted Solid mode (that will be rendered by Eevee. Reviewers: fclem, brecht Reviewed By: fclem Subscribers: sergey Tags: #code_quest Maniphest Tasks: T54726 Differential Revision: https://developer.blender.org/D3174
2018-04-25 10:59:48 +02:00
prop = RNA_def_property(srna, "random_object_color_saturation", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Workbench_random_object_color_saturation_get", "rna_LayerEngineSettings_Workbench_random_object_color_saturation_set", NULL);
RNA_def_property_ui_text(prop, "Random Saturation", "Random Object Color Saturation");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
prop = RNA_def_property(srna, "random_object_color_value", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Workbench_random_object_color_value_get", "rna_LayerEngineSettings_Workbench_random_object_color_value_set", NULL);
RNA_def_property_ui_text(prop, "Random Value", "Random Object Color Value");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
Workbench: Added studio lighting to view layer
2018-04-25 15:59:15 +02:00
RNA_define_verify_sdna(1); /* not in sdna */
Workbench: Added Object Color to collection_properties
2018-04-16 15:01:31 +02:00
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
static void rna_def_view_layer_settings(BlenderRNA *brna)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
StructRNA *srna;
PropertyRNA *prop;
FunctionRNA *func;
PropertyRNA *parm;
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
srna = RNA_def_struct(brna, "ViewLayerSettings", NULL);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_struct_sdna(srna, "IDProperty");
RNA_def_struct_ui_text(srna, "Scene Layer Settings",
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
"Engine specific settings that can be overriden by ViewLayer");
RNA_def_struct_refine_func(srna, "rna_ViewLayerSettings_refine");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_define_verify_sdna(0);
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_string_funcs(prop, "rna_ViewLayerSettings_name_get", "rna_ViewLayerSettings_name_length", NULL);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_ui_text(prop, "Name", "Engine Name");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_struct_name_property(srna, prop);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
func = RNA_def_function(srna, "use", "rna_ViewLayerSettings_use");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_function_flag(func, FUNC_USE_SELF_ID);
RNA_def_function_ui_description(func, "Initialize this property to use");
parm = RNA_def_string(func, "identifier", NULL, 0, "Property Name", "Name of the property to set");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
func = RNA_def_function(srna, "unuse", "rna_ViewLayerSettings_unuse");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_function_flag(func, FUNC_USE_SELF_ID);
RNA_def_function_ui_description(func, "Remove the property");
parm = RNA_def_string(func, "identifier", NULL, 0, "Property Name", "Name of the property to unset");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
#ifdef WITH_CLAY_ENGINE
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
rna_def_view_layer_engine_settings_clay(brna);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
#endif
Workbench: Added studio lighting to view layer
2018-04-25 15:59:15 +02:00
rna_def_view_layer_engine_settings_workbench(brna);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
rna_def_view_layer_engine_settings_eevee(brna);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_define_verify_sdna(1);
}
static void rna_def_layer_collection_settings(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
FunctionRNA *func;
PropertyRNA *parm;
srna = RNA_def_struct(brna, "LayerCollectionSettings", NULL);
RNA_def_struct_sdna(srna, "IDProperty");
RNA_def_struct_ui_text(srna, "Layer Collection Settings",
"Engine specific settings that can be overriden by LayerCollection");
RNA_def_struct_refine_func(srna, "rna_LayerCollectionSettings_refine");
RNA_define_verify_sdna(0);
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_string_funcs(prop, "rna_LayerCollectionSettings_name_get", "rna_LayerCollectionSettings_name_length", NULL);
RNA_def_property_ui_text(prop, "Name", "Engine Name");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_struct_name_property(srna, prop);
func = RNA_def_function(srna, "use", "rna_LayerCollectionSettings_use");
RNA_def_function_flag(func, FUNC_USE_SELF_ID);
RNA_def_function_ui_description(func, "Initialize this property to use");
parm = RNA_def_string(func, "identifier", NULL, 0, "Property Name", "Name of the property to set");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
func = RNA_def_function(srna, "unuse", "rna_LayerCollectionSettings_unuse");
RNA_def_function_flag(func, FUNC_USE_SELF_ID);
RNA_def_function_ui_description(func, "Remove the property");
parm = RNA_def_string(func, "identifier", NULL, 0, "Property Name", "Name of the property to unset");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
#ifdef WITH_CLAY_ENGINE
rna_def_layer_collection_engine_settings_clay(brna);
#endif
Workbench: Added Object Color to collection_properties
2018-04-16 15:01:31 +02:00
rna_def_layer_collection_engine_settings_workbench(brna);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_define_verify_sdna(1);
}
static void rna_def_layer_collection(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
FunctionRNA *func;
PropertyRNA *parm;
srna = RNA_def_struct(brna, "LayerCollection", NULL);
RNA_def_struct_ui_text(srna, "Layer Collection", "Layer collection");
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 15:20:17 +02:00
RNA_def_struct_ui_icon(srna, ICON_COLLAPSEMENU);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_string_funcs(prop, "rna_LayerCollection_name_get", "rna_LayerCollection_name_length", "rna_LayerCollection_name_set");
RNA_def_property_ui_text(prop, "Name", "Collection name");
RNA_def_struct_name_property(srna, prop);
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, NULL);
prop = RNA_def_property(srna, "collection", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_pointer_sdna(prop, NULL, "scene_collection");
RNA_def_property_struct_type(prop, "SceneCollection");
RNA_def_property_ui_text(prop, "Collection", "Collection this layer collection is wrapping");
prop = RNA_def_property(srna, "collections", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "layer_collections", NULL);
RNA_def_property_struct_type(prop, "LayerCollection");
RNA_def_property_ui_text(prop, "Layer Collections", "");
prop = RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "object_bases", NULL);
RNA_def_property_struct_type(prop, "Object");
RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, "rna_LayerCollection_objects_get", NULL, NULL, NULL, NULL);
RNA_def_property_ui_text(prop, "Objects", "All the objects directly or indirectly added to this collection (not including sub-collection objects)");
prop = RNA_def_property(srna, "overrides", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "overrides", NULL);
RNA_def_property_struct_type(prop, "LayerCollectionOverride");
RNA_def_property_ui_text(prop, "Collection Overrides", "");
/* Override settings */
prop = RNA_def_property(srna, "engine_overrides", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "properties->data.group", NULL);
RNA_def_property_struct_type(prop, "LayerCollectionSettings");
RNA_def_property_ui_text(prop, "Collection Settings", "Override of engine specific render settings");
/* Functions */
func = RNA_def_function(srna, "move_above", "rna_LayerCollection_move_above");
RNA_def_function_ui_description(func, "Move collection after another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN);
parm = RNA_def_pointer(func, "lc_dst", "LayerCollection", "Collection", "Reference collection above which the collection will move");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "move_below", "rna_LayerCollection_move_below");
RNA_def_function_ui_description(func, "Move collection before another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN);
parm = RNA_def_pointer(func, "lc_dst", "LayerCollection", "Collection", "Reference collection below which the collection will move");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "move_into", "rna_LayerCollection_move_into");
RNA_def_function_ui_description(func, "Move collection into another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN);
parm = RNA_def_pointer(func, "lc_dst", "LayerCollection", "Collection", "Collection to insert into");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
Groups and collection: create group from collection You could still create groups as before, with Ctl + G. This will create a group with a single visible collection. However you can also create a group from an existing collection. Just go to the menu you get in the outliner when clicking in a collection and pick "Create Group". Remember to instance the group afterwards, or link it into a new scene or file. The group and the collection are not kept in sync afterwards. You need to manually edit the group for further changes.
2017-12-01 12:23:05 -02:00
func = RNA_def_function(srna, "create_group", "rna_LayerCollection_create_group");
RNA_def_function_ui_description(func, "Enable or disable a collection");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN | FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
parm = RNA_def_pointer(func, "result", "Group", "", "Newly created Group");
RNA_def_function_return(func, parm);
Collections: Operator to duplicate a collection When duplicating a layer collection directly linked to the view layer we copy the collection and link it. For all the not directly linked layer collectionns, we try to sync the layer collection flags, overrides, ... Also we make sure the new collection is right after the original collection. We also expose this in RNA, via collection.duplicate().
2018-02-01 21:11:59 -02:00
func = RNA_def_function(srna, "duplicate", "rna_LayerCollection_duplicate");
RNA_def_function_ui_description(func, "Create a copy of the collection");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN | FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
parm = RNA_def_pointer(func, "result", "LayerCollection", "", "Newly created collection");
RNA_def_function_return(func, parm);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Flags */
Group collection viewport/render options and remove collection visibility Users can change the group collection visibility in the outliner when looking at groups. Regular collections on the other hand don't have any special visibility control, if you need a collection to be invisible during render, either don't link it into the view layer used for F12, or disable it. This includes: * Updated unittests - update your lib/tests/layers folder. * Subversion bump - branches be aware of that. Note: Although we are using eval_ctx to determine the visibility of a group collection when rendering, the depsgraph is still using the same depsgraph for the viewport and the render engine, so at the moment the render visibility is ignored. Following next is a workaround for this separately to tag the groups before and after rendering to tackle that.
2017-12-14 11:46:49 -02:00
prop = RNA_def_property(srna, "selectable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", COLLECTION_SELECTABLE);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 1);
RNA_def_property_ui_text(prop, "Selectable", "Restrict selection");
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_LayerCollection_flag_update");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
Group collection viewport/render options and remove collection visibility Users can change the group collection visibility in the outliner when looking at groups. Regular collections on the other hand don't have any special visibility control, if you need a collection to be invisible during render, either don't link it into the view layer used for F12, or disable it. This includes: * Updated unittests - update your lib/tests/layers folder. * Subversion bump - branches be aware of that. Note: Although we are using eval_ctx to determine the visibility of a group collection when rendering, the depsgraph is still using the same depsgraph for the viewport and the render engine, so at the moment the render visibility is ignored. Following next is a workaround for this separately to tag the groups before and after rendering to tackle that.
2017-12-14 11:46:49 -02:00
prop = RNA_def_property(srna, "visible_viewport", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", COLLECTION_VIEWPORT);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 1);
Group collection viewport/render options and remove collection visibility Users can change the group collection visibility in the outliner when looking at groups. Regular collections on the other hand don't have any special visibility control, if you need a collection to be invisible during render, either don't link it into the view layer used for F12, or disable it. This includes: * Updated unittests - update your lib/tests/layers folder. * Subversion bump - branches be aware of that. Note: Although we are using eval_ctx to determine the visibility of a group collection when rendering, the depsgraph is still using the same depsgraph for the viewport and the render engine, so at the moment the render visibility is ignored. Following next is a workaround for this separately to tag the groups before and after rendering to tackle that.
2017-12-14 11:46:49 -02:00
RNA_def_property_ui_text(prop, "Viewport Visibility", "");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_LayerCollection_flag_update");
Group collection viewport/render options and remove collection visibility Users can change the group collection visibility in the outliner when looking at groups. Regular collections on the other hand don't have any special visibility control, if you need a collection to be invisible during render, either don't link it into the view layer used for F12, or disable it. This includes: * Updated unittests - update your lib/tests/layers folder. * Subversion bump - branches be aware of that. Note: Although we are using eval_ctx to determine the visibility of a group collection when rendering, the depsgraph is still using the same depsgraph for the viewport and the render engine, so at the moment the render visibility is ignored. Following next is a workaround for this separately to tag the groups before and after rendering to tackle that.
2017-12-14 11:46:49 -02:00
prop = RNA_def_property(srna, "visible_render", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", COLLECTION_RENDER);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Group collection viewport/render options and remove collection visibility Users can change the group collection visibility in the outliner when looking at groups. Regular collections on the other hand don't have any special visibility control, if you need a collection to be invisible during render, either don't link it into the view layer used for F12, or disable it. This includes: * Updated unittests - update your lib/tests/layers folder. * Subversion bump - branches be aware of that. Note: Although we are using eval_ctx to determine the visibility of a group collection when rendering, the depsgraph is still using the same depsgraph for the viewport and the render engine, so at the moment the render visibility is ignored. Following next is a workaround for this separately to tag the groups before and after rendering to tackle that.
2017-12-14 11:46:49 -02:00
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
RNA_def_property_ui_text(prop, "Render Visibility", "Control");
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_LayerCollection_flag_update");
prop = RNA_def_property(srna, "enabled", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", COLLECTION_DISABLED);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_ui_text(prop, "Enabled", "Enable or disable collection");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_LayerCollection_flag_update");
}
static void rna_def_layer_collections(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
FunctionRNA *func;
PropertyRNA *prop;
PropertyRNA *parm;
RNA_def_property_srna(cprop, "LayerCollections");
srna = RNA_def_struct(brna, "LayerCollections", NULL);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_struct_sdna(srna, "ViewLayer");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_struct_ui_text(srna, "Layer Collections", "Collections of render layer");
prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "active_collection");
RNA_def_property_int_funcs(prop, "rna_LayerCollections_active_collection_index_get",
"rna_LayerCollections_active_collection_index_set",
"rna_LayerCollections_active_collection_index_range");
RNA_def_property_ui_text(prop, "Active Collection Index", "Active index in layer collection array");
RNA_def_property_update(prop, NC_SCENE | ND_LAYER, NULL);
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "LayerCollection");
RNA_def_property_pointer_funcs(prop, "rna_LayerCollections_active_collection_get",
"rna_LayerCollections_active_collection_set", NULL, NULL);
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL);
RNA_def_property_ui_text(prop, "Active Layer Collection", "Active Layer Collection");
RNA_def_property_update(prop, NC_SCENE | ND_LAYER, NULL);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
func = RNA_def_function(srna, "link", "rna_ViewLayer_collection_link");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_function_ui_description(func, "Link a collection to render layer");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN);
parm = RNA_def_pointer(func, "scene_collection", "SceneCollection", "", "Collection to add to render layer");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_pointer(func, "result", "LayerCollection", "", "Newly created layer collection");
RNA_def_function_return(func, parm);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
func = RNA_def_function(srna, "unlink", "rna_ViewLayer_collection_unlink");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_function_ui_description(func, "Unlink a collection from render layer");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN | FUNC_USE_REPORTS);
parm = RNA_def_pointer(func, "layer_collection", "LayerCollection", "", "Layer collection to remove from render layer");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
}
static void rna_def_layer_objects(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
PropertyRNA *prop;
RNA_def_property_srna(cprop, "LayerObjects");
srna = RNA_def_struct(brna, "LayerObjects", NULL);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_struct_sdna(srna, "ViewLayer");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_struct_ui_text(srna, "Layer Objects", "Collections of objects");
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "Object");
RNA_def_property_pointer_funcs(prop, "rna_LayerObjects_active_object_get", "rna_LayerObjects_active_object_set", NULL, NULL);
Remove workspace object mode, reverts changes w/ 2.8 This caused too many problems syncing object modes with multiple objects/windows/workspaces, see: D3130 for details.
2018-04-05 18:20:27 +02:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_ui_text(prop, "Active Object", "Active object for this layer");
Farewell Scene->basact
2017-11-09 13:11:20 -02:00
/* Could call: ED_object_base_activate(C, rl->basact);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
* but would be a bad level call and it seems the notifier is enough */
Remove workspace object mode, reverts changes w/ 2.8 This caused too many problems syncing object modes with multiple objects/windows/workspaces, see: D3130 for details.
2018-04-05 18:20:27 +02:00
RNA_def_property_update(prop, NC_SCENE | ND_OB_ACTIVE, NULL);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "selected", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "object_bases", NULL);
RNA_def_property_struct_type(prop, "Object");
RNA_def_property_collection_funcs(prop, "rna_LayerObjects_selected_begin", "rna_iterator_listbase_next",
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
"rna_iterator_listbase_end", "rna_ViewLayer_objects_get",
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
NULL, NULL, NULL, NULL);
RNA_def_property_ui_text(prop, "Selected Objects", "All the selected objects of this layer");
}
static void rna_def_object_base(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
srna = RNA_def_struct(brna, "ObjectBase", NULL);
RNA_def_struct_sdna(srna, "Base");
RNA_def_struct_ui_text(srna, "Object Base", "An object instance in a render layer");
RNA_def_struct_ui_icon(srna, ICON_OBJECT_DATA);
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "object");
RNA_def_property_ui_text(prop, "Object", "Object this base links to");
prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", BASE_SELECTED);
RNA_def_property_ui_text(prop, "Select", "Object base selection state");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_ObjectBase_select_update");
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
void RNA_def_view_layer(BlenderRNA *brna)
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
{
FunctionRNA *func;
StructRNA *srna;
PropertyRNA *prop;
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
srna = RNA_def_struct(brna, "ViewLayer", NULL);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_struct_ui_text(srna, "Render Layer", "Render layer");
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 15:20:17 +02:00
RNA_def_struct_ui_icon(srna, ICON_RENDER_RESULT);
RNA_def_struct_path_func(srna, "rna_ViewLayer_path");
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_struct_idprops_func(srna, "rna_ViewLayer_idprops");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
rna_def_view_layer_common(srna, 1);
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-16 13:39:25 -02:00
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
func = RNA_def_function(srna, "update_render_passes", "rna_ViewLayer_update_render_passes");
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-16 13:39:25 -02:00
RNA_def_function_ui_description(func, "Requery the enabled render passes from the render engine");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_NO_SELF);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
prop = RNA_def_property(srna, "collections", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "layer_collections", NULL);
RNA_def_property_struct_type(prop, "LayerCollection");
RNA_def_property_ui_text(prop, "Layer Collections", "");
rna_def_layer_collections(brna, prop);
prop = RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "object_bases", NULL);
RNA_def_property_struct_type(prop, "Object");
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, "rna_ViewLayer_objects_get", NULL, NULL, NULL, NULL);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_ui_text(prop, "Objects", "All the objects in this layer");
rna_def_layer_objects(brna, prop);
/* layer options */
prop = RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", VIEW_LAYER_RENDER);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_ui_text(prop, "Enabled", "Disable or enable the render layer");
RNA_def_property_update(prop, NC_SCENE | ND_LAYER, NULL);
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-16 13:39:25 -02:00
prop = RNA_def_property(srna, "use_freestyle", PROP_BOOLEAN, PROP_NONE);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", VIEW_LAYER_FREESTYLE);
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-16 13:39:25 -02:00
RNA_def_property_ui_text(prop, "Freestyle", "Render stylized strokes in this Layer");
RNA_def_property_update(prop, NC_SCENE | ND_LAYER, NULL);
/* Freestyle */
rna_def_freestyle_settings(brna);
prop = RNA_def_property(srna, "freestyle_settings", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_pointer_sdna(prop, NULL, "freestyle_config");
RNA_def_property_struct_type(prop, "FreestyleSettings");
RNA_def_property_ui_text(prop, "Freestyle Settings", "");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Override settings */
prop = RNA_def_property(srna, "engine_overrides", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "properties->data.group", NULL);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_struct_type(prop, "ViewLayerSettings");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_property_ui_text(prop, "Layer Settings", "Override of engine specific render settings");
/* debug update routine */
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
func = RNA_def_function(srna, "update", "rna_ViewLayer_update_tagged");
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
RNA_def_function_flag(func, FUNC_USE_CONTEXT);
RNA_def_function_ui_description(func,
"Update data tagged to be updated from previous access to data or operators");
Depsgraph: Make graph to be per-scene-layer for RNA New access is C.scene.render_layers.active.depsgraph. This will give depsgraph for a given layer. In the future there will need to be some extra context to be passed.
2017-11-03 17:27:13 +01:00
/* Dependency Graph */
prop = RNA_def_property(srna, "depsgraph", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "Depsgraph");
RNA_def_property_ui_text(prop, "Dependency Graph", "Dependencies in the scene data");
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
RNA_def_property_pointer_funcs(prop, "rna_ViewLayer_depsgraph_get", NULL, NULL, NULL);
Depsgraph: Make graph to be per-scene-layer for RNA New access is C.scene.render_layers.active.depsgraph. This will give depsgraph for a given layer. In the future there will need to be some extra context to be passed.
2017-11-03 17:27:13 +01:00
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
/* Nested Data */
/* *** Non-Animated *** */
RNA_define_animate_sdna(false);
rna_def_scene_collection(brna);
rna_def_layer_collection(brna);
rna_def_layer_collection_override(brna);
rna_def_object_base(brna);
RNA_define_animate_sdna(true);
/* *** Animated *** */
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
rna_def_view_layer_settings(brna);
Refactor: Move rna_scene.c layer/collection to rna_layer.c rna_scene.c was getting way too big with data that was related to DNA_layer_types.h. I tried doing it earlier, but failed. But now with the new changes I think it's better to do this sooner than later.
2017-10-23 17:46:35 -02:00
rna_def_layer_collection_settings(brna);
}
#endif
Copy Permalink