[Bf-blender-cvs] [10b738d] cycles-ptex-12: Really stupid but working texture test

[Nicholas Bishop]

Commit: 10b738d6c19c1c8d771274b20b4762c71bad8f52
Author: Nicholas Bishop
Date:   Fri Jan 23 00:31:25 2015 +0100
Branches: cycles-ptex-12
https://developer.blender.org/rB10b738d6c19c1c8d771274b20b4762c71bad8f52

Really stupid but working texture test

===================================================================

M       intern/cycles/blender/blender_mesh.cpp
M       source/blender/blenkernel/intern/subsurf_ccg.c

===================================================================

diff --git a/intern/cycles/blender/blender_mesh.cpp 
b/intern/cycles/blender/blender_mesh.cpp
index 19d03c3..295dade 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -371,6 +371,7 @@ static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh 
b_mesh, const vector<
 
                for (b_mesh.tessfaces.begin(f); f != b_mesh.tessfaces.end(); 
++f) {
                        BL::PtexTessFace ptex = f->ptex_tess_face();
+                       if (!ptex) break;
                        const int num_triangles = (nverts[cur_tessface] == 4) ? 
2 : 1;
 
                        for (int i = 0; i < num_triangles; i++) {
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c 
b/source/blender/blenkernel/intern/subsurf_ccg.c
index f36de83..3c4a5fa 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -3117,7 +3117,8 @@ static void *ccgDM_get_loop_data_layer(DerivedMesh *dm, 
int type)
                                const int numVerts = 
ccgSubSurf_getFaceNumVerts(f);
                                int j;
 
-                               if (numVerts == 4) {
+                               ///if (numVerts == 4) {
+                               if (false) {
                                        ccgDM_ptex_update_quad_loops(output + 
output_index,
                                                                     gridFaces);
                                } else {
@@ -3135,13 +3136,13 @@ static void *ccgDM_get_loop_data_layer(DerivedMesh *dm, 
int type)
                                                }
                                                output_index++;
                                        }
-                                       if (numVerts != 4) {
+                                       //if (numVerts != 4) {
                                                ptex_id++;
-                                       }
-                               }
-                               if (numVerts == 4) {
-                                       ptex_id++;
+                                               //}
                                }
+                               /* if (numVerts == 4) { */
+                               /*      ptex_id++; */
+                               /* } */
 
                                //output_index += numVerts * gridFaces * 
gridFaces;
                        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs