[Bf-blender-cvs] [673a149e87] render-layers: Merge remote-tracking branch 'origin/blender2.8' into render-layers

Dalai Felinto noreply at git.blender.org
Mon Jan 23 11:23:24 CET 2017


Commit: 673a149e877ca820a1a2fa3a8211418cd71e33e0
Author: Dalai Felinto
Date:   Mon Jan 23 11:17:09 2017 +0100
Branches: render-layers
https://developer.blender.org/rB673a149e877ca820a1a2fa3a8211418cd71e33e0

Merge remote-tracking branch 'origin/blender2.8' into render-layers

===================================================================



===================================================================

diff --cc source/blender/makesrna/intern/rna_scene.c
index e41be32622,1166fb89a0..018ce7a98f
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -423,7 -445,7 +448,8 @@@ EnumPropertyItem rna_enum_gpencil_inter
  #include "MEM_guardedalloc.h"
  
  #include "BKE_brush.h"
 +#include "BKE_collection.h"
+ #include "BKE_colortools.h"
  #include "BKE_context.h"
  #include "BKE_global.h"
  #include "BKE_image.h"
@@@ -2141,386 -2185,75 +2190,453 @@@ static int rna_gpu_is_hq_supported_get(
  	return GPU_instanced_drawing_support() && GPU_geometry_shader_support();
  }
  
 +static void rna_SceneCollection_name_set(PointerRNA *ptr, const char *value)
 +{
 +	Scene *scene = (Scene *)ptr->id.data;
 +	SceneCollection *sc = (SceneCollection *)ptr->data;
 +	SceneCollection *sc_master = BKE_collection_master(scene);
 +
 +	BLI_strncpy_utf8(sc->name, value, sizeof(sc->name));
 +	BLI_uniquename(&sc_master->scene_collections, sc, DATA_("SceneCollection"), '.', offsetof(SceneCollection, name), sizeof(sc->name));
 +}
 +
 +static void rna_SceneCollection_filter_set(PointerRNA *ptr, const char *value)
 +{
 +	Scene *scene = (Scene *)ptr->id.data;
 +	SceneCollection *sc = (SceneCollection *)ptr->data;
 +	BLI_strncpy_utf8(sc->filter, value, sizeof(sc->filter));
 +
 +	TODO_LAYER_SYNC_FILTER;
 +	(void)scene;
 +}
 +
 +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 SceneCollection *rna_SceneCollection_new(ID *id, SceneCollection *sc_parent, const char *name)
 +{
 +	Scene *scene = (Scene *)id;
 +	SceneCollection *sc = BKE_collection_add(scene, sc_parent, name);
 +
 +	DAG_id_tag_update(&scene->id, 0);
 +	WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
 +
 +	return sc;
 +}
 +
 +static void rna_SceneCollection_remove(
 +        ID *id, SceneCollection *sc_parent, ReportList *reports, PointerRNA *sc_ptr)
 +{
 +	Scene *scene = (Scene *)id;
 +	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;
 +	}
 +
 +	if (!BKE_collection_remove(scene, sc)) {
 +		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);
 +
 +	DAG_id_tag_update(&scene->id, 0);
 +	WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
 +}
 +
 +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;
 +	}
 +
 +	BKE_collection_object_add(scene, sc, ob);
 +
 +	/* TODO(sergey): Only update relations for the current scene. */
 +	DAG_relations_tag_update(bmain);
 +	DAG_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;
 +	}
 +
 +	BKE_collection_object_remove(bmain, scene, sc, ob, false);
 +
 +	/* needed otherwise the depgraph will contain freed objects which can crash, see [#20958] */
 +	DAG_relations_tag_update(bmain);
 +
 +	WM_main_add_notifier(NC_SCENE | ND_LAYER | ND_OB_ACTIVE, scene);
 +}
 +
 +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)
 +{
 +	Scene *scene = (Scene *)ptr->id.data;
 +	SceneCollection *sc = ((LayerCollection *)ptr->data)->scene_collection;
 +	SceneCollection *sc_master = BKE_collection_master(scene);
 +
 +	BLI_strncpy_utf8(sc->name, value, sizeof(sc->name));
 +	BLI_uniquename(&sc_master->scene_collections, sc, DATA_("SceneCollection"), '.', offsetof(SceneCollection, name), sizeof(sc->name));
 +}
 +
 +static PointerRNA rna_LayerCollection_objects_get(CollectionPropertyIterator *iter)
 +{
 +	ListBaseIterator *internal = &iter->internal.listbase;
 +	ObjectBase *base = ((LinkData *)internal->link)->data;
 +	return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, base->object);
 +}
 +
 +static void rna_LayerCollection_hide_update(bContext *C, PointerRNA *ptr)
 +{
 +	Scene *scene = CTX_data_scene(C);
 +	LayerCollection *lc = ptr->data;
 +	SceneLayer *sl = BKE_scene_layer_find_from_collection(scene, lc);
 +
 +	/* hide and deselect bases that are directly influenced by this LayerCollection */
 +	BKE_scene_layer_base_flag_recalculate(sl);
 +	WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 +}
 +
 +static void rna_LayerCollection_hide_select_update(bContext *C, PointerRNA *ptr)
 +{
 +	LayerCollection *lc = ptr->data;
 +
 +	if ((lc->flag & COLLECTION_SELECTABLE) == 0) {
 +		Scene *scene = CTX_data_scene(C);
 +		SceneLayer *sl = BKE_scene_layer_find_from_collection(scene, lc);
 +
 +		/* deselect bases that are directly influenced by this LayerCollection */
 +		BKE_scene_layer_base_flag_recalculate(sl);
 +		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, CTX_data_scene(C));
 +	}
 +}
 +
 +static int rna_LayerCollections_active_collection_index_get(PointerRNA *ptr)
 +{
 +	SceneLayer *sl = (SceneLayer *)ptr->data;
 +	return sl->active_collection;
 +}
 +
 +static void rna_LayerCollections_active_collection_index_set(PointerRNA *ptr, int value)
 +{
 +	SceneLayer *sl = (SceneLayer *)ptr->data;
 +	int num_collections = BKE_layer_collection_count(sl);
 +	sl->active_collection = min_ff(value, num_collections - 1);
 +}
 +
 +static void rna_LayerCollections_active_collection_index_range(
 +        PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax))
 +{
 +	SceneLayer *sl = (SceneLayer *)ptr->data;
 +	*min = 0;
 +	*max = max_ii(0, BKE_layer_collection_count(sl) - 1);
 +}
 +
 +static PointerRNA rna_LayerCollections_active_collection_get(PointerRNA *ptr)
 +{
 +	SceneLayer *sl = (SceneLayer *)ptr->data;
 +	LayerCollection *lc = BKE_layer_collection_active(sl);
 +	return rna_pointer_inherit_refine(ptr, &RNA_LayerCollection, lc);
 +}
 +
 +static void rna_LayerCollections_active_collection_set(PointerRNA *ptr, PointerRNA value)
 +{
 +	SceneLayer *sl = (SceneLayer *)ptr->data;
 +	LayerCollection *lc = (LayerCollection *)value.data;
 +	const int index = BKE_layer_collection_findindex(sl, lc);
 +	if (index != -1) sl->active_collection = index;
 +}
 +
 +LayerCollection * rna_SceneLayer_collection_link(
 +        ID *id, SceneLayer *sl, Main *bmain, SceneCollection *sc)
 +{
 +	Scene *scene = (Scene *)id;
 +	LayerCollection *lc = BKE_collection_link(sl, sc);
 +
 +	/* TODO(sergey/dfelinto): Only update relations for the current scenelayer. */
 +	DAG_relations_tag_update(bmain);
 +	WM_main_add_notifier(NC_SCENE | ND_LAYER, scene);
 +
 +	return lc;
 +}
 +
 +static void rna_SceneLayer_collection_unlink(
 +        ID *id, SceneLayer *sl, Main *bmain, ReportList *reports, LayerCollection *lc)
 +{
 +	Scene *scene = (Scene *)id;
 +
 +	if (BLI_findindex(&sl->layer_collections, lc) == -1) {
 +		BKE_reportf(reports, RPT_ERROR, "Layer collection '%s' is not in '%s'", lc->scene_collection->name, sl->name);
 +		return;
 +	}
 +
 +	BKE_collection_unlink(sl, lc);
 +
 +	/* needed otherwise the depgraph will contain freed objects which can crash, see [#20958] */
 +	/* TODO(sergey/dfelinto): Only update relations for the current scenelayer. */
 +	DAG_relations_tag_update(bmain);
 +
 +	WM_main_add_notifier(NC_SCENE | ND_LAYER | ND_OB_ACTIVE, scene);
 +}
 +
 +static PointerRNA rna_LayerObjects_active_object_get(PointerRNA *ptr)
 +{
 +	SceneLayer *sl = (SceneLayer *)ptr->data;
 +	return rna_pointer_inherit_refine(ptr, &RNA_Object, sl->basact ? sl->basact->object : NULL);
 +}
 +
 +static void rna_LayerObjects_active_object_set(PointerRNA *ptr, PointerRNA value)
 +{
 +	SceneLayer *sl = (SceneLayer *)ptr->data;
 +	if (value.data)
 +		sl->basact = BKE_scene_layer_base_find(sl, (Object *)value.data);
 +	else
 +		sl->basact = NULL;
 +}
 +
 +static void rna_SceneLayer_name_set(PointerRNA *ptr, const char *value)
 +{
 +	Scene *scene = (Scene *)ptr->id.data;
 +	SceneLayer *sl = (SceneLayer *)ptr->data;
 +	char oldname[sizeof(sl->name)];
 +
 +	BLI_strncpy(oldname, sl->name, sizeof(sl->name));
 +
 +	BLI_strncpy_utf8(sl->name, value, sizeof(sl->name));
 +	BLI_uniquename(&scene->render_layers, sl, DATA_("SceneLayer"), '.', offsetof(SceneLayer, name), sizeof(sl->name));
 +
 +	if (scene->nodetree) {
 +		bNode *node;
 +		int index = BLI_findindex(&scene->render_layers, sl);
 +
 +		for (node = scene->nodetree->nodes.first; node; node = node->next) {
 +			if (node->type == CMP_NODE_R_LAYERS && node->id == NULL) {
 +				if (node->custom1 == index)
 +					BLI_strncpy(node->name, sl->name, NODE_MAXSTR);
 +			}
 +		}
 +	}
 +}
 +
 +static PointerRNA rna_SceneLayer_objects_get(CollectionPropertyIterator *iter)
 +{
 +	ListBaseIterator *internal = &iter->internal.listbase;
 +
 +	/* we are actually iterating a ObjectBase list, so override get */
 +	ObjectBase *base = (ObjectBase *)internal->link;
 +	return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, base->object);
 +}
 +
 +static int rna_SceneLayer_objects_selected_sk

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list