[Bf-blender-cvs] [c492f26549d] refactor-idprop-ui-data: Cleanup: Reoder definition
Hans Goudey
noreply at git.blender.org
Wed Jul 14 17:21:57 CEST 2021
Commit: c492f26549d83c67c2ad05056cf2bc69b29d1131
Author: Hans Goudey
Date: Wed Jul 14 11:05:33 2021 -0400
Branches: refactor-idprop-ui-data
https://developer.blender.org/rBc492f26549d83c67c2ad05056cf2bc69b29d1131
Cleanup: Reoder definition
===================================================================
M source/blender/blenkernel/BKE_idprop.h
M source/blender/makesdna/DNA_ID.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h
index 7c87ea7e86e..925b289e56f 100644
--- a/source/blender/blenkernel/BKE_idprop.h
+++ b/source/blender/blenkernel/BKE_idprop.h
@@ -143,7 +143,6 @@ struct IDProperty *IDP_New(const char type,
const IDPropertyTemplate *val,
const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
-void IDP_free_ui_data(struct IDProperty *prop);
void IDP_FreePropertyContent_ex(struct IDProperty *prop, const bool do_id_user);
void IDP_FreePropertyContent(struct IDProperty *prop);
void IDP_FreeProperty_ex(struct IDProperty *prop, const bool do_id_user);
@@ -230,6 +229,7 @@ typedef enum eIDPropertyUIDataType {
bool IDP_ui_data_supported(const struct IDProperty *prop);
eIDPropertyUIDataType IDP_ui_data_type(const struct IDProperty *prop);
+void IDP_free_ui_data(struct IDProperty *prop);
struct IDPropertyUIData *IDP_ui_data_ensure(struct IDProperty *prop);
struct IDPropertyUIData *IDP_ui_data_copy(const struct IDProperty *prop);
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 5e7ceb6f84a..d0a47df627b 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -65,7 +65,7 @@ typedef struct IDPropertyUIData {
/** RNA subtype, used for every type except string properties (PropertySubType). */
int rna_subtype;
- int _pad;
+ char _pad[4];
} IDPropertyUIData;
/* IDP_UI_DATA_TYPE_INT */
More information about the Bf-blender-cvs
mailing list