Clean up error message for pigment/normal/density variant of max_extent() function.

c-lipka · c-lipka · commit 46c9ecb6138e · 2016-08-24T11:46:20.000+02:00
diff --git a/source/base/version.h b/source/base/version.h
@@ -45,7 +45,7 @@
 #define OFFICIAL_VERSION_STRING "3.7.1"
 #define OFFICIAL_VERSION_NUMBER 371
 
-#define POV_RAY_PRERELEASE "alpha.8747741"
+#define POV_RAY_PRERELEASE "alpha.8755786"
 
 #if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
 #ifdef POV_RAY_PRERELEASE
diff --git a/source/parser/parser_expressions.cpp b/source/parser/parser_expressions.cpp
@@ -1212,7 +1212,6 @@ void Parser::Parse_Num_Factor (EXPRESS& Express,int *Terms)
                 case MAX_EXTENT_TOKEN:
                     GET (LEFT_PAREN_TOKEN);
                     EXPECT
-
                         CASE (OBJECT_ID_TOKEN)
                             Object = reinterpret_cast<ObjectPtr>(Token.Data);
                             if ( Object )
@@ -1237,8 +1236,7 @@ void Parser::Parse_Num_Factor (EXPRESS& Express,int *Terms)
                             }
                             else
                             {
-                                Error("\rThe parameter to max_extent must be a bump_map, image map\r"
-                                      "or density_file form of a normal, pigment or density identifier.");
+                                Error("A pigment, normal or density parameter to max_extent must be based on an image or density file.");
                             }
                             EXIT
                         END_CASE
diff --git a/unix/VERSION b/unix/VERSION
@@ -1 +1 @@
-3.7.1-alpha.8747741
+3.7.1-alpha.8755786

Original file line number	Diff line number	Diff line change
`@@ -1212,7 +1212,6 @@ void Parser::Parse_Num_Factor (EXPRESS& Express,int *Terms)`
`1212`	`1212`	`case MAX_EXTENT_TOKEN:`
`1213`	`1213`	`GET (LEFT_PAREN_TOKEN);`
`1214`	`1214`	`EXPECT`
`1215`		`-`
`1216`	`1215`	`CASE (OBJECT_ID_TOKEN)`
`1217`	`1216`	`Object = reinterpret_cast<ObjectPtr>(Token.Data);`
`1218`	`1217`	`if ( Object )`
`@@ -1237,8 +1236,7 @@ void Parser::Parse_Num_Factor (EXPRESS& Express,int *Terms)`
`1237`	`1236`	`}`
`1238`	`1237`	`else`
`1239`	`1238`	`{`
`1240`		`- Error("\rThe parameter to max_extent must be a bump_map, image map\r"`
`1241`		`- "or density_file form of a normal, pigment or density identifier.");`
	`1239`	`+ Error("A pigment, normal or density parameter to max_extent must be based on an image or density file.");`
`1242`	`1240`	`}`
`1243`	`1241`	`EXIT`
`1244`	`1242`	`END_CASE`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3.7.1-alpha.8747741`
	`1`	`+3.7.1-alpha.8755786`