sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Removed/disabled debugging code.

Browse Source
This commit is contained in:
Tamito Kajiyama 2014-07-19 18:53:02 +09:00
parent 34c133a488
commit 7b1234be1c
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/blender/blender_mesh.cpp
View File

@ -408,30 +408,17 @@ static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, const vector<
float3 *fdata = attr->data_float3(); float3 *fdata = attr->data_float3();
size_t i = 0; size_t i = 0;
std::cout << "name " << name << std::endl;
for(l->data.begin(t); t != l->data.end(); ++t, ++i) { for(l->data.begin(t); t != l->data.end(); ++t, ++i) {
fdata[0] = get_float3(t->uv1()); fdata[0] = get_float3(t->uv1());
fdata[1] = get_float3(t->uv2()); fdata[1] = get_float3(t->uv2());
fdata[2] = get_float3(t->uv3()); fdata[2] = get_float3(t->uv3());
fdata += 3; fdata += 3;
#if 0
std::cout << " 1st "
<< "( " << t->uv1()[0] << ", " << t->uv1()[1] << ") "
<< "( " << t->uv2()[0] << ", " << t->uv2()[1] << ") "
<< "( " << t->uv3()[0] << ", " << t->uv3()[1] << ") " << std::endl;
#endif
if(nverts[i] == 4) { if(nverts[i] == 4) {
fdata[0] = get_float3(t->uv1()); fdata[0] = get_float3(t->uv1());
fdata[1] = get_float3(t->uv3()); fdata[1] = get_float3(t->uv3());
fdata[2] = get_float3(t->uv4()); fdata[2] = get_float3(t->uv4());
fdata += 3; fdata += 3;
#if 0
std::cout << " 2nd "
<< "( " << t->uv1()[0] << ", " << t->uv1()[1] << ") "
<< "( " << t->uv3()[0] << ", " << t->uv3()[1] << ") "
<< "( " << t->uv4()[0] << ", " << t->uv4()[1] << ") " << std::endl;
#endif
} }
} }
} }

1
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
View File

@ -227,7 +227,6 @@ Material* BlenderStrokeRenderer::GetStrokeShader(bContext *C, Main *bmain, bNode
bNodeSocket *fromsock, *tosock; bNodeSocket *fromsock, *tosock;
PointerRNA fromptr, toptr; PointerRNA fromptr, toptr;
cout << "linestyle " << linestyle << " nodetree " << linestyle->nodetree << " use_nodes " << linestyle->use_nodes << endl;
if (iNodeTree) { if (iNodeTree) {
// make a copy of linestyle->nodetree // make a copy of linestyle->nodetree
ntree = ntreeCopyTree_ex(iNodeTree, bmain, true); ntree = ntreeCopyTree_ex(iNodeTree, bmain, true);

1
source/blender/freestyle/intern/stroke/StrokeRep.cpp
View File

@ -516,7 +516,6 @@ void Strip::setVertexColor (const vector<StrokeVertex *>& iStrokeVertices)
void Strip::computeTexCoord (const vector<StrokeVertex *>& iStrokeVertices, float texStep) void Strip::computeTexCoord (const vector<StrokeVertex *>& iStrokeVertices, float texStep)
{ {
cout << "Strip::computeTexCoord texStep " << texStep << endl;
vector<StrokeVertex *>::const_iterator v, vend; vector<StrokeVertex *>::const_iterator v, vend;
StrokeVertex *sv; StrokeVertex *sv;
int i = 0; int i = 0;

6
source/blender/render/intern/source/pipeline.c
View File

@ -1940,7 +1940,7 @@ static void add_freestyle(Render *re, int render)
actsrl = BLI_findlink(&re->r.layers, re->r.actlay); actsrl = BLI_findlink(&re->r.layers, re->r.actlay);
#if 0 #if 1
re->freestyle_bmain = BKE_main_new(); re->freestyle_bmain = BKE_main_new();
/* We use the same window manager for freestyle bmain as /* We use the same window manager for freestyle bmain as
@ -2020,7 +2020,7 @@ static void free_all_freestyle_renders(void)
if (freestyle_render) { if (freestyle_render) {
freestyle_scene = freestyle_render->scene; freestyle_scene = freestyle_render->scene;
RE_FreeRender(freestyle_render); RE_FreeRender(freestyle_render);
#if 0 #if 1
BKE_scene_unlink(re1->freestyle_bmain, freestyle_scene, NULL); BKE_scene_unlink(re1->freestyle_bmain, freestyle_scene, NULL);
#endif #endif
} }
@ -2028,7 +2028,7 @@ static void free_all_freestyle_renders(void)
BLI_freelistN(&re1->freestyle_renders); BLI_freelistN(&re1->freestyle_renders);
if (re1->freestyle_bmain) { if (re1->freestyle_bmain) {
#if 0 #if 1
/* detach the window manager from freestyle bmain (see comments /* detach the window manager from freestyle bmain (see comments
* in add_freestyle() for more detail) * in add_freestyle() for more detail)
*/ */