[Bf-blender-cvs] [f7ce20e3404] blender-v3.3-release: Cleanup: Remove two files committed by mistake.
Bastien Montagne
noreply at git.blender.org
Sat Aug 27 09:11:51 CEST 2022
Commit: f7ce20e3404749388a73bed8d57e8decc52b154c
Author: Bastien Montagne
Date: Sat Aug 27 09:09:41 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBf7ce20e3404749388a73bed8d57e8decc52b154c
Cleanup: Remove two files committed by mistake.
Committed in rB3c7a6718ddc.
===================================================================
D source/blender/blenkernel/BKE_lib_principle_properties.h
D source/blender/blenkernel/intern/lib_principle_properties.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_lib_principle_properties.h b/source/blender/blenkernel/BKE_lib_principle_properties.h
deleted file mode 100644
index 42177204efb..00000000000
--- a/source/blender/blenkernel/BKE_lib_principle_properties.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2022 Blender Foundation. All rights reserved. */
-
-#pragma once
-
-/** \file
- * \ingroup bke
- *
- * API to manage principle properties in data-blocks.
- *
- * Principle properties are properties that are defined as the ones most user will need to
- * edit when using this data-block.
- *
- * They current main usage in is library overrides.
- *
- * \note `BKE_lib_` files are for operations over data-blocks themselves, although they might
- * alter Main as well (when creating/renaming/deleting an ID e.g.).
- *
- * \section Function Names
- *
- * - `BKE_lib_principleprop_` should be used for function affecting a single ID.
- * - `BKE_lib_principleprop_main_` should be used for function affecting the whole collection
- * of IDs in a given Main data-base.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ID;
-struct IDPrincipleProperties;
-struct IDPrincipleProperty;
-struct PointerRNA;
-struct PropertyRNA;
-struct ReportList;
-
-/**
- * Initialize empty list of principle properties for \a id.
- */
-struct IDPrincipleProperties *BKE_lib_principleprop_init(struct ID *id);
-#if 0
-/**
- * Shallow or deep copy of a whole principle properties from \a src_id to \a dst_id.
- */
-void BKE_lib_principleprop_copy(struct ID *dst_id, const struct ID *src_id, bool do_full_copy);
-#endif
-/**
- * Clear any principle properties data from given \a override.
- */
-void BKE_lib_principleprop_clear(struct IDPrincipleProperties *principle_props, bool do_id_user);
-/**
- * Free given \a principle_props.
- */
-void BKE_lib_principleprop_free(struct IDPrincipleProperties **principle_props, bool do_id_user);
-
-/**
- * Find principle property from given RNA path, if it exists.
- */
-struct IDPrincipleProperty *BKE_lib_principleprop_find(
- struct IDPrincipleProperties *principle_props, const char *rna_path);
-/**
- * Find principle property from given RNA path, or create it if it does not exist.
- */
-struct IDPrincipleProperty *BKE_lib_principleprop_get(
- struct IDPrincipleProperties *principle_props, const char *rna_path, bool *r_created);
-/**
- * Remove and free given \a principle_prop from given ID \a principle_props.
- */
-void BKE_lib_principleprop_delete(struct IDPrincipleProperties *principle_props,
- struct IDPrincipleProperty *principle_prop);
-/**
- * Get the RNA-property matching the \a principle_prop principle property. Used for UI to query
- * additional data about the principle property (e.g. UI name).
- *
- * \param idpoin: RNA Pointer of the ID.
- * \param principle_prop: The principle property to find the matching RNA property for.
- */
-bool BKE_lib_principleprop_rna_property_find(struct PointerRNA *idpoin,
- const struct IDPrincipleProperty *principle_prop,
- struct PointerRNA *r_principle_poin,
- struct PropertyRNA **r_principle_prop);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/blenkernel/intern/lib_principle_properties.c b/source/blender/blenkernel/intern/lib_principle_properties.c
deleted file mode 100644
index 204ca9ff9d6..00000000000
--- a/source/blender/blenkernel/intern/lib_principle_properties.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2022 Blender Foundation. All rights reserved. */
-
-/** \file
- * \ingroup bke
- */
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "CLG_log.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_ID.h"
-
-#include "BKE_lib_id.h"
-#include "BKE_lib_principle_properties.h"
-#include "BKE_report.h"
-
-#include "BLO_readfile.h"
-
-#include "BLI_listbase.h"
-#include "BLI_string.h"
-
-#include "RNA_access.h"
-#include "RNA_prototypes.h"
-#include "RNA_types.h"
-
-static CLG_LogRef LOG = {"bke.idprincipleprops"};
-
-IDPrincipleProperties *BKE_lib_principleprop_init(ID *id)
-{
- BLI_assert(id->principle_properties == NULL);
-
- /* Else, generate new empty override. */
- id->principle_properties = MEM_callocN(sizeof(*id->principle_properties), __func__);
-
- return id->principle_properties;
-}
-
-void BKE_lib_principleprop_clear(IDPrincipleProperties *principle_props, bool UNUSED(do_id_user))
-{
- LISTBASE_FOREACH_MUTABLE (IDPrincipleProperty *, pprop, &principle_props->properties) {
- BLI_assert(pprop->rna_path != NULL);
- MEM_freeN(pprop->rna_path);
- MEM_freeN(pprop);
- }
- BLI_listbase_clear(&principle_props->properties);
- principle_props->flag = 0;
-}
-
-void BKE_lib_principleprop_free(IDPrincipleProperties **principle_props, bool do_id_user)
-{
- BLI_assert(*principle_props != NULL);
-
- BKE_lib_principleprop_clear(*principle_props, do_id_user);
- MEM_freeN(*principle_props);
- *principle_props = NULL;
-}
-
-IDPrincipleProperty *BKE_lib_principleprop_find(IDPrincipleProperties *principle_props,
- const char *rna_path)
-{
- return BLI_findstring_ptr(
- &principle_props->properties, rna_path, offsetof(IDPrincipleProperty, rna_path));
-}
-
-IDPrincipleProperty *BKE_lib_principleprop_get(IDPrincipleProperties *principle_props,
- const char *rna_path,
- bool *r_created)
-{
- IDPrincipleProperty *pprop = BKE_lib_principleprop_find(principle_props, rna_path);
-
- if (pprop == NULL) {
- pprop = MEM_callocN(sizeof(*pprop), __func__);
- pprop->rna_path = BLI_strdup(rna_path);
- BLI_addtail(&principle_props->properties, pprop);
-
- if (r_created) {
- *r_created = true;
- }
- }
- else if (r_created) {
- *r_created = false;
- }
-
- return pprop;
-}
-
-void BKE_lib_principleprop_delete(IDPrincipleProperties *principle_props,
- IDPrincipleProperty *principle_prop)
-{
- BLI_remlink(&principle_props->properties, principle_prop);
-}
-
-bool BKE_lib_principleprop_rna_property_find(struct PointerRNA *idpoin,
- const struct IDPrincipleProperty *principle_prop,
- struct PointerRNA *r_principle_poin,
- struct PropertyRNA **r_principle_prop)
-{
- BLI_assert(RNA_struct_is_ID(idpoin->type));
- return RNA_path_resolve_property(
- idpoin, principle_prop->rna_path, r_principle_poin, r_principle_prop);
-}
More information about the Bf-blender-cvs
mailing list