2.5: remove vertex normal flip option, this is more harmful than helpful

in many cases, and also gave incorrect rim lighting.

2 files changed, 8 insertions, 10 deletions

diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 2b0de46f2e6..c75ae594daf 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -587,23 +587,21 @@ typedef struct LampRen {
 #define R_HALO			2
 #define R_SEC_FIELD		4
 #define R_LAMPHALO		8
-#define R_GLOB_NOPUNOFLIP	16
-#define R_NEED_TANGENT	32
-#define R_BAKE_TRACE	128
-#define R_BAKING		256
+#define R_NEED_TANGENT	16
+#define R_BAKE_TRACE	32
+#define R_BAKING		64
 
 /* vlakren->flag (vlak = face in dutch) char!!! */
 #define R_SMOOTH		1
 #define R_HIDDEN		2
 /* strand flag, means special handling */
 #define R_STRAND		4
-#define R_NOPUNOFLIP	8
-#define R_FULL_OSA		16
-#define R_FACE_SPLIT	32
+#define R_FULL_OSA		8
+#define R_FACE_SPLIT	16
 /* Tells render to divide face other way. */
-#define R_DIVIDE_24		64	
+#define R_DIVIDE_24		32	
 /* vertex normals are tangent or view-corrected vector, for hair strands */
-#define R_TANGENT		128		
+#define R_TANGENT		64		
 
 /* strandbuffer->flag */
 #define R_STRAND_BSPLINE	1
diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h
index 2a0086b436c..76e7fe7b4f3 100644
--- a/source/blender/render/intern/include/renderdatabase.h
+++ b/source/blender/render/intern/include/renderdatabase.h
@@ -115,7 +115,7 @@ struct MCol *RE_vlakren_get_mcol(struct ObjectRen *obr, VlakRen *ren, int n, cha
 float *RE_vlakren_get_surfnor(struct ObjectRen *obr, VlakRen *ren, int verify);
 float *RE_vlakren_get_nmap_tangent(struct ObjectRen *obr, VlakRen *ren, int verify);
 RadFace **RE_vlakren_get_radface(struct ObjectRen *obr, VlakRen *ren, int verify);
-int RE_vlakren_get_normal(struct Render *re, struct ObjectInstanceRen *obi, struct VlakRen *vlr, float *nor);
+void RE_vlakren_get_normal(struct Render *re, struct ObjectInstanceRen *obi, struct VlakRen *vlr, float *nor);
 
 float *RE_strandren_get_surfnor(struct ObjectRen *obr, struct StrandRen *strand, int verify);
 float *RE_strandren_get_uv(struct ObjectRen *obr, struct StrandRen *strand, int n, char **name, int verify);