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

Campbell Barton ideasman42 at gmail.com
Mon Mar 15 12:20:49 CET 2010


Revision: 27512
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27512
Author:   campbellbarton
Date:     2010-03-15 12:20:49 +0100 (Mon, 15 Mar 2010)

Log Message:
-----------
implify skipping quad->tri was being done even when the main simplify option was disabled.

Modified Paths:
--------------
    branches/render25/source/blender/editors/space_file/space_file.c
    branches/render25/source/blender/render/intern/source/object_mesh.c

Modified: branches/render25/source/blender/editors/space_file/space_file.c
===================================================================
--- branches/render25/source/blender/editors/space_file/space_file.c	2010-03-15 11:00:00 UTC (rev 27511)
+++ branches/render25/source/blender/editors/space_file/space_file.c	2010-03-15 11:20:49 UTC (rev 27512)
@@ -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: branches/render25/source/blender/render/intern/source/object_mesh.c
===================================================================
--- branches/render25/source/blender/render/intern/source/object_mesh.c	2010-03-15 11:00:00 UTC (rev 27511)
+++ branches/render25/source/blender/render/intern/source/object_mesh.c	2010-03-15 11:20:49 UTC (rev 27512)
@@ -2798,7 +2798,7 @@
 				/* Baking lets us define a quad split order */
 				split_quads(obr, re->params.r.bake_quad_split);
 			} else {
-				if((re->params.r.simplify_flag & R_SIMPLE_NO_TRIANGULATE) == 0)
+				if((re->params.r.mode & R_SIMPLIFY && re->params.r.simplify_flag & R_SIMPLE_NO_TRIANGULATE) == 0)
 					check_non_flat_quads(obr);
 			}
 			





More information about the Bf-blender-cvs mailing list