[Bf-blender-cvs] [e9634b6930e] blender2.8: Cleanup, typo in naming

Sergey Sharybin noreply at git.blender.org
Fri Dec 7 17:30:56 CET 2018


Commit: e9634b6930e4712260d69a2c4e350783144a371a
Author: Sergey Sharybin
Date:   Fri Dec 7 17:30:19 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBe9634b6930e4712260d69a2c4e350783144a371a

Cleanup, typo in naming

\Something went wrong in the rename script..

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

M	source/blender/depsgraph/intern/depsgraph_tag.cc
M	source/blender/makesdna/DNA_ID.h

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

diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 491548e7a18..f5f2b3424e8 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -168,7 +168,7 @@ void depsgraph_tag_to_component_opcode(const ID *id,
 			break;
 		case ID_RECALC_PSYS_REDO:
 		case ID_RECALC_PSYS_RESET:
-		case ID_RECALC_PSYS_YPE:
+		case ID_RECALC_PSYS_TYPE:
 		case ID_RECALC_PSYS_CHILD:
 		case ID_RECALC_PSYS_PHYS:
 			if (id_type == ID_PA) {
@@ -592,7 +592,7 @@ const char *DEG_update_tag_as_string(IDRecalcFlag flag)
 		case ID_RECALC_ANIMATION: return "ANIMATION";
 		case ID_RECALC_PSYS_REDO: return "PSYS_REDO";
 		case ID_RECALC_PSYS_RESET: return "PSYS_RESET";
-		case ID_RECALC_PSYS_YPE: return "PSYS_TYPE";
+		case ID_RECALC_PSYS_TYPE: return "PSYS_TYPE";
 		case ID_RECALC_PSYS_CHILD: return "PSYS_CHILD";
 		case ID_RECALC_PSYS_PHYS: return "PSYS_PHYS";
 		case ID_RECALC_PSYS_ALL: return "PSYS_ALL";
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index bf2a6a727d3..9888b01a367 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -522,7 +522,7 @@ typedef enum IDRecalcFlag {
 	/* Particle system changed; values are aligned with ID_RECALC_PSYS_xxx. */
 	ID_RECALC_PSYS_REDO   = (1 << 3),  /* Only do pathcache etc */
 	ID_RECALC_PSYS_RESET  = (1 << 4),  /* Reset everything including pointcache. */
-	ID_RECALC_PSYS_YPE   = (1 << 5),  /* Handle system type change. */
+	ID_RECALC_PSYS_TYPE   = (1 << 5),  /* Handle system type change. */
 	ID_RECALC_PSYS_CHILD  = (1 << 6),  /* Only child settings changed. */
 	ID_RECALC_PSYS_PHYS   = (1 << 7),  /* Physics type changed. */
 	/* Update copy on write component without flushing down the road. */
@@ -552,7 +552,7 @@ typedef enum IDRecalcFlag {
 	/* Identifies that something in particle system did change. */
 	ID_RECALC_PSYS_ALL    = (ID_RECALC_PSYS_REDO |
 	                         ID_RECALC_PSYS_RESET |
-	                         ID_RECALC_PSYS_YPE |
+	                         ID_RECALC_PSYS_TYPE |
 	                         ID_RECALC_PSYS_CHILD |
 	                         ID_RECALC_PSYS_PHYS),



More information about the Bf-blender-cvs mailing list