Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-11-23 07:45:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-23 09:40:49 +0300
commit6e4cb463c44ab57331cda7ded645b4faa573bbb3 (patch)
tree8da615bcb135c1f52872a9a9b34a888a0ccf064f /source/blender/makesrna/intern/rna_object_force.c
parentdaa90de3fdb5b9971b713c13a67b9c0a0990b3d7 (diff)
Cleanup: shadowing (rna, modifiers, *misc*)
Diffstat (limited to 'source/blender/makesrna/intern/rna_object_force.c')
-rw-r--r--source/blender/makesrna/intern/rna_object_force.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index 6ace0966b36..76785e1a852 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -164,7 +164,7 @@ static void rna_Cache_idname_change(Main *UNUSED(bmain), Scene *UNUSED(scene), P
PointCache *cache = (PointCache *)ptr->data;
PTCacheID *pid = NULL, *pid2 = NULL;
ListBase pidlist;
- int new_name = 1;
+ bool use_new_name = true;
if (!ob)
return;
@@ -194,11 +194,11 @@ static void rna_Cache_idname_change(Main *UNUSED(bmain), Scene *UNUSED(scene), P
else if (cache->name[0] != '\0' && STREQ(cache->name, pid->cache->name)) {
/*TODO: report "name exists" to user */
BLI_strncpy(cache->name, cache->prev_name, sizeof(cache->name));
- new_name = 0;
+ use_new_name = false;
}
}
- if (new_name) {
+ if (use_new_name) {
if (pid2 && cache->flag & PTCACHE_DISK_CACHE) {
char old_name[80];
char new_name[80];