[Bf-blender-cvs] [f7722b1ad33] asset-engine: Cleanup: rename uuid's related operator properties to match names used everywhere else.
Bastien Montagne
noreply at git.blender.org
Wed Oct 11 20:38:50 CEST 2017
Commit: f7722b1ad33a4647b763849f08a15342777ebb01
Author: Bastien Montagne
Date: Wed Oct 11 20:37:58 2017 +0200
Branches: asset-engine
https://developer.blender.org/rBf7722b1ad33a4647b763849f08a15342777ebb01
Cleanup: rename uuid's related operator properties to match names used everywhere else.
===================================================================
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/windowmanager/intern/wm_files_link.c
M source/blender/windowmanager/intern/wm_operator_props.c
===================================================================
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index d83f2a68cf7..fd9ad58d926 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -1240,19 +1240,19 @@ void file_sfile_to_operator_ex(
RNA_property_string_set(op->ptr, prop, filepath);
}
if (ae && uuids) {
- if ((prop = RNA_struct_find_property(op->ptr, "repository_uuid"))) {
+ if ((prop = RNA_struct_find_property(op->ptr, "uuid_repository"))) {
RNA_property_int_set_array(op->ptr, prop, uuids->uuids[0].uuid_repository);
}
- if ((prop = RNA_struct_find_property(op->ptr, "asset_uuid"))) {
+ if ((prop = RNA_struct_find_property(op->ptr, "uuid_asset"))) {
RNA_property_int_set_array(op->ptr, prop, uuids->uuids[0].uuid_asset);
}
- if ((prop = RNA_struct_find_property(op->ptr, "variant_uuid"))) {
+ if ((prop = RNA_struct_find_property(op->ptr, "uuid_variant"))) {
RNA_property_int_set_array(op->ptr, prop, uuids->uuids[0].uuid_variant);
}
- if ((prop = RNA_struct_find_property(op->ptr, "revision_uuid"))) {
+ if ((prop = RNA_struct_find_property(op->ptr, "uuid_revision"))) {
RNA_property_int_set_array(op->ptr, prop, uuids->uuids[0].uuid_revision);
}
- if ((prop = RNA_struct_find_property(op->ptr, "view_uuid"))) {
+ if ((prop = RNA_struct_find_property(op->ptr, "uuid_view"))) {
RNA_property_int_set_array(op->ptr, prop, uuids->uuids[0].uuid_view);
}
}
@@ -1273,11 +1273,11 @@ void file_sfile_to_operator_ex(
RNA_string_set(&itemptr, "name", entry->relpath);
if (ae) {
BLI_assert(i < uuids->nbr_uuids);
- RNA_int_set_array(&itemptr, "repository_uuid", uuids->uuids[i].uuid_repository);
- RNA_int_set_array(&itemptr, "asset_uuid", uuids->uuids[i].uuid_asset);
- RNA_int_set_array(&itemptr, "variant_uuid", uuids->uuids[i].uuid_variant);
- RNA_int_set_array(&itemptr, "revision_uuid", uuids->uuids[i].uuid_revision);
- RNA_int_set_array(&itemptr, "view_uuid", uuids->uuids[i].uuid_view);
+ RNA_int_set_array(&itemptr, "uuid_repository", uuids->uuids[i].uuid_repository);
+ RNA_int_set_array(&itemptr, "uuid_asset", uuids->uuids[i].uuid_asset);
+ RNA_int_set_array(&itemptr, "uuid_variant", uuids->uuids[i].uuid_variant);
+ RNA_int_set_array(&itemptr, "uuid_revision", uuids->uuids[i].uuid_revision);
+ RNA_int_set_array(&itemptr, "uuid_view", uuids->uuids[i].uuid_view);
}
}
}
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 7d7a5d11757..3353c475848 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -691,11 +691,11 @@ static void view3d_path_link_drop_copy(wmDrag *drag, wmDropBox *drop)
RNA_string_set(drop->ptr, "asset_engine", drag_data->ae_idname);
RNA_string_set(drop->ptr, "directory", "");
RNA_string_set(drop->ptr, "filename", drag_data->path);
- RNA_int_set_array(drop->ptr, "repository_uuid", drag_data->uuid.uuid_repository);
- RNA_int_set_array(drop->ptr, "asset_uuid", drag_data->uuid.uuid_asset);
- RNA_int_set_array(drop->ptr, "variant_uuid", drag_data->uuid.uuid_variant);
- RNA_int_set_array(drop->ptr, "revision_uuid", drag_data->uuid.uuid_revision);
- RNA_int_set_array(drop->ptr, "view_uuid", drag_data->uuid.uuid_view);
+ RNA_int_set_array(drop->ptr, "uuid_repository", drag_data->uuid.uuid_repository);
+ RNA_int_set_array(drop->ptr, "uuid_asset", drag_data->uuid.uuid_asset);
+ RNA_int_set_array(drop->ptr, "uuid_variant", drag_data->uuid.uuid_variant);
+ RNA_int_set_array(drop->ptr, "uuid_revision", drag_data->uuid.uuid_revision);
+ RNA_int_set_array(drop->ptr, "uuid_view", drag_data->uuid.uuid_view);
}
static void view3d_ob_drop_copy(wmDrag *drag, wmDropBox *drop)
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 369fb0917a4..897511f2028 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -1680,19 +1680,19 @@ static void rna_def_operator_filelist_element(BlenderRNA *brna)
RNA_def_property_flag(prop, PROP_IDPROPERTY);
RNA_def_property_ui_text(prop, "Name", "Name of a file or directory within a file list");
- prop = RNA_def_int_vector(srna, "repository_uuid", 4, NULL, INT_MIN, INT_MAX,
+ prop = RNA_def_int_vector(srna, "uuid_repository", 4, NULL, INT_MIN, INT_MAX,
"Repository UUID", "Identifier of this item's repository in current asset engine", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_IDPROPERTY);
- prop = RNA_def_int_vector(srna, "asset_uuid", 4, NULL, INT_MIN, INT_MAX,
+ prop = RNA_def_int_vector(srna, "uuid_asset", 4, NULL, INT_MIN, INT_MAX,
"Asset UUID", "Identifier of this item in current asset engine", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_IDPROPERTY);
- prop = RNA_def_int_vector(srna, "variant_uuid", 4, NULL, INT_MIN, INT_MAX,
+ prop = RNA_def_int_vector(srna, "uuid_variant", 4, NULL, INT_MIN, INT_MAX,
"Variant UUID", "Identifier of this item's variant in current asset engine", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_IDPROPERTY);
- prop = RNA_def_int_vector(srna, "revision_uuid", 4, NULL, INT_MIN, INT_MAX,
+ prop = RNA_def_int_vector(srna, "uuid_revision", 4, NULL, INT_MIN, INT_MAX,
"Revision UUID", "Identifier of this item's revision in current asset engine", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_IDPROPERTY);
- prop = RNA_def_int_vector(srna, "view_uuid", 4, NULL, INT_MIN, INT_MAX,
+ prop = RNA_def_int_vector(srna, "uuid_view", 4, NULL, INT_MIN, INT_MAX,
"View UUID", "Identifier of this item's view in current asset engine", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_IDPROPERTY);
}
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index 36b854fdd76..613bed5fa90 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -499,11 +499,11 @@ static int wm_link_append_exec(bContext *C, wmOperator *op)
BLI_join_dirfile(path, sizeof(path), root, relname);
if (aet) {
- RNA_int_get_array(&itemptr, "repository_uuid", uuid.uuid_repository);
- RNA_int_get_array(&itemptr, "asset_uuid", uuid.uuid_asset);
- RNA_int_get_array(&itemptr, "variant_uuid", uuid.uuid_variant);
- RNA_int_get_array(&itemptr, "revision_uuid", uuid.uuid_revision);
- RNA_int_get_array(&itemptr, "view_uuid", uuid.uuid_view);
+ RNA_int_get_array(&itemptr, "uuid_repository", uuid.uuid_repository);
+ RNA_int_get_array(&itemptr, "uuid_asset", uuid.uuid_asset);
+ RNA_int_get_array(&itemptr, "uuid_variant", uuid.uuid_variant);
+ RNA_int_get_array(&itemptr, "uuid_revision", uuid.uuid_revision);
+ RNA_int_get_array(&itemptr, "uuid_view", uuid.uuid_view);
}
if (BLO_library_path_explode(path, libname, &group, &name)) {
@@ -534,11 +534,11 @@ static int wm_link_append_exec(bContext *C, wmOperator *op)
WMLinkAppendDataItem *item;
if (aet) {
- RNA_int_get_array(op->ptr, "repository_uuid", uuid.uuid_repository);
- RNA_int_get_array(op->ptr, "asset_uuid", uuid.uuid_asset);
- RNA_int_get_array(op->ptr, "variant_uuid", uuid.uuid_variant);
- RNA_int_get_array(op->ptr, "revision_uuid", uuid.uuid_revision);
- RNA_int_get_array(op->ptr, "view_uuid", uuid.uuid_view);
+ RNA_int_get_array(op->ptr, "uuid_repository", uuid.uuid_repository);
+ RNA_int_get_array(op->ptr, "uuid_asset", uuid.uuid_asset);
+ RNA_int_get_array(op->ptr, "uuid_variant", uuid.uuid_variant);
+ RNA_int_get_array(op->ptr, "uuid_revision", uuid.uuid_revision);
+ RNA_int_get_array(op->ptr, "uuid_view", uuid.uuid_view);
}
if (group) {
diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c
index 5f71c95ccd3..899abcf0f24 100644
--- a/source/blender/windowmanager/intern/wm_operator_props.c
+++ b/source/blender/windowmanager/intern/wm_operator_props.c
@@ -77,19 +77,19 @@ void WM_operator_properties_filesel(
"Identifier of relevant asset engine (if any)");
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
if (flag & (WM_FILESEL_FILEPATH | WM_FILESEL_FILENAME)) {
- prop = RNA_def_int_vector(ot->srna, "repository_uuid", 4, NULL, INT_MIN, INT_MAX,
+ prop = RNA_def_int_vector(ot->srna, "uuid_repository", 4, NULL, INT_MIN, INT_MAX,
"Repository UUID", "Identifier of this item's repository in current asset engine", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
- prop = RNA_def_int_vector(ot->srna, "asset_uuid", 4, NULL, INT_MIN, INT_MAX,
+ prop = RNA_def_int_vector(ot->srna, "uuid_asset", 4, NULL, INT_MIN, INT_MAX,
"Asset UUID", "Identifier of this item in current asset engine", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
- prop = RNA_def_int_vector(ot->srna, "variant_uuid", 4, NULL, INT_MIN, INT_MAX,
+ prop = RNA_def_int_vector(ot->srna, "uuid_variant", 4, NULL, INT_MIN, INT_MAX,
"Variant UUID", "Identifier of this item's variant in current asset engine", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
- prop = RNA_def_int_vector(ot->srna, "revision_uuid", 4, NULL, INT_MIN, INT_MAX,
+ prop = RNA_def_int_vector(ot->srna, "uuid_revision", 4, NULL, INT_MIN, INT_MAX,
"Revision UUID", "Identifier of this item's revision in current asset engine", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
- prop = RNA_def_int_vector(ot->srna, "view_uuid", 4, NULL, INT_MIN, INT_MAX,
+ prop = RNA_def_int_vector(ot->srna, "uuid_view", 4, NULL, INT_MIN, INT_MAX,
"View UUID", "Identifier of this item's view in current asset engine", INT_MIN, INT_MAX);
RNA_def
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list