blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Static overrides optimization: 30% quicker. 

use stack instead of always allocating memory for RNA paths of checked
properties! From average 167ms to 118ms here with Autumn rig... Still a
lot to improve, but that's already much better.
This commit is contained in:
Bastien Montagne 2018-04-20 12:19:14 +02:00
parent 03a916e5b5
commit 89bdc208d1
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/library_override.c
View File

@ -510,7 +510,7 @@ bool BKE_override_static_status_check_reference(ID *local)
* all properties in depth (all overridable ones at least). Generating diff values and applying overrides
* are much cheaper.
*
* \return true is new overriding op was created, or some local data was reset. */
* \return true if new overriding op was created, or some local data was reset. */
bool BKE_override_static_operations_create(ID *local, const bool force_auto)
{
BLI_assert(local->override_static != NULL);

24
source/blender/makesrna/intern/rna_access.c
View File

@ -7503,15 +7503,25 @@ bool RNA_struct_override_matches(
continue;
}
#define RNA_PATH_BUFFSIZE 8192
#define RNA_PATH_PRINTF(_str, ...) \
if (BLI_snprintf(rna_path, RNA_PATH_BUFFSIZE, \
(_str), __VA_ARGS__) >= RNA_PATH_BUFFSIZE) \
{ rna_path = BLI_sprintfN((_str), __VA_ARGS__); }(void)0
#define RNA_PATH_FREE \
if (rna_path != rna_path_buffer) MEM_freeN(rna_path)
char rna_path_buffer[RNA_PATH_BUFFSIZE];
char *rna_path = rna_path_buffer;
/* XXX TODO this will have to be refined to handle collections insertions, and array items */
char *rna_path;
if (root_path) {
/* Inlined building, much much more efficient. */
if (prop_local->magic == RNA_MAGIC) {
rna_path = BLI_sprintfN("%s.%s", root_path, RNA_property_identifier(prop_local));
RNA_PATH_PRINTF("%s.%s", root_path, RNA_property_identifier(prop_local));
}
else {
rna_path = BLI_sprintfN("%s[\"%s\"]", root_path, RNA_property_identifier(prop_local));
RNA_PATH_PRINTF("%s[\"%s\"]", root_path, RNA_property_identifier(prop_local));
}
}
else {
@ -7524,7 +7534,7 @@ bool RNA_struct_override_matches(
// printf("Override Checking %s\n", rna_path);
if (ignore_overridden && BKE_override_static_property_find(override, rna_path) != NULL) {
MEM_SAFE_FREE(rna_path);
RNA_PATH_FREE;
continue;
}
@ -7577,7 +7587,11 @@ bool RNA_struct_override_matches(
}
}
MEM_SAFE_FREE(rna_path);
RNA_PATH_FREE;
#undef RNA_PATH_BUFFSIZE
#undef RNA_PATH_PRINTF
#undef RNA_PATH_FREE
}
RNA_property_collection_end(&iter);