[Bf-blender-cvs] [6ef34525a18] blender2.8: Depsgraph: Cleanup, variable name

Sergey Sharybin noreply at git.blender.org
Thu Jul 27 15:23:11 CEST 2017


Commit: 6ef34525a186580980de3d374628c180a7c15ef2
Author: Sergey Sharybin
Date:   Thu Jul 27 15:10:22 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB6ef34525a186580980de3d374628c180a7c15ef2

Depsgraph: Cleanup, variable name

===================================================================

M	source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 198f6003c14..607397bb42a 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -684,8 +684,8 @@ ID *deg_expand_copy_on_write_datablock(const Depsgraph *depsgraph,
 	 * or cases where we want to do something smarter than simple datablock
 	 * copy.
 	 */
-	const short type = GS(id_orig->name);
-	switch (type) {
+	const short id_type = GS(id_orig->name);
+	switch (id_type) {
 		case ID_SCE:
 		{
 			Scene *new_scene = scene_copy_no_main((Scene *)id_orig);




More information about the Bf-blender-cvs mailing list