[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27552] trunk/blender/source/blender: implify skipping quad-> tri was being done even when the main simplify option was disabled.

[Brecht Van Lommel]

Revision: 27552
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27552
Author:   blendix
Date:     2010-03-16 18:58:13 +0100 (Tue, 16 Mar 2010)

Log Message:
-----------
implify skipping quad->tri was being done even when the main simplify option was disabled.
(commit 27512 by Campbell from render25 branch)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/space_file.c
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/editors/space_file/space_file.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/space_file.c	2010-03-16 17:49:31 UTC (rev 27551)
+++ trunk/blender/source/blender/editors/space_file/space_file.c	2010-03-16 17:58:13 UTC (rev 27552)
@@ -227,7 +227,7 @@
 
 static void file_listener(ScrArea *sa, wmNotifier *wmn)
 {
-	SpaceFile* sfile = (SpaceFile*)sa->spacedata.first;
+    /* SpaceFile* sfile = (SpaceFile*)sa->spacedata.first; */
 
 	/* context changes */
 	switch(wmn->category) {

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2010-03-16 17:49:31 UTC (rev 27551)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2010-03-16 17:58:13 UTC (rev 27552)
@@ -4226,7 +4226,7 @@
 				/* Baking lets us define a quad split order */
 				split_quads(obr, re->r.bake_quad_split);
 			} else {
-				if((re->r.simplify_flag & R_SIMPLE_NO_TRIANGULATE) == 0)
+				if((re->r.mode & R_SIMPLIFY && re->r.simplify_flag & R_SIMPLE_NO_TRIANGULATE) == 0)
 					check_non_flat_quads(obr);
 			}