implify skipping quad->tri was being done even when the main simplify option was...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 16 Mar 2010 17:58:13 +0000 (17:58 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 16 Mar 2010 17:58:13 +0000 (17:58 +0000)
(commit 27512 by Campbell from render25 branch)

source/blender/editors/space_file/space_file.c
source/blender/render/intern/source/convertblender.c

index 141d4f63f1ce2250b683baaea57d3b8cc1f09d54..640fce39b16f1142ad3a6a79f0a35a1c9ef79ed4 100644 (file)
@@ -227,7 +227,7 @@ static void file_refresh(const bContext *C, ScrArea *sa)
 
 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) {
index 5a363b9cdfe4483985a5d95d9e6cf4260cc6f5ac..c756a1350487c77d1edd4e9560ce7fd7f4ea2d56 100644 (file)
@@ -4226,7 +4226,7 @@ static void finalize_render_object(Render *re, ObjectRen *obr, int timeoffset)
                                /* 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);
                        }