Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use '#if 0' for commented code-block

Browse Source
This commit is contained in:
Campbell Barton
2021-06-24 15:42:35 +10:00
parent 879b89e967
commit 2e99a74df9
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/svm/svm_geometry.h
View File

@@ -220,11 +220,13 @@ ccl_device void svm_node_hair_info(
stack_store_float(stack, out_offset, data); stack_store_float(stack, out_offset, data);
break; break;
} }
/*case NODE_INFO_CURVE_FADE: { # if 0
case NODE_INFO_CURVE_FADE: {
data = sd->curve_transparency; data = sd->curve_transparency;
stack_store_float(stack, out_offset, data); stack_store_float(stack, out_offset, data);
break; break;
}*/ }
# endif
case NODE_INFO_CURVE_TANGENT_NORMAL: { case NODE_INFO_CURVE_TANGENT_NORMAL: {
data3 = curve_tangent_normal(kg, sd); data3 = curve_tangent_normal(kg, sd);
stack_store_float3(stack, out_offset, data3); stack_store_float3(stack, out_offset, data3);

8
intern/cycles/render/nodes.cpp
View File

@@ -4425,12 +4425,12 @@ void HairInfoNode::compile(SVMCompiler &compiler)
if (!out->links.empty()) { if (!out->links.empty()) {
compiler.add_node(NODE_HAIR_INFO, NODE_INFO_CURVE_TANGENT_NORMAL, compiler.stack_assign(out)); compiler.add_node(NODE_HAIR_INFO, NODE_INFO_CURVE_TANGENT_NORMAL, compiler.stack_assign(out));
} }
#if 0
/*out = output("Fade"); out = output("Fade");
if(!out->links.empty()) { if(!out->links.empty()) {
compiler.add_node(NODE_HAIR_INFO, NODE_INFO_CURVE_FADE, compiler.stack_assign(out)); compiler.add_node(NODE_HAIR_INFO, NODE_INFO_CURVE_FADE, compiler.stack_assign(out));
}*/ }
#endif
out = output("Random"); out = output("Random");
if (!out->links.empty()) { if (!out->links.empty()) {
int attr = compiler.attribute(ATTR_STD_CURVE_RANDOM); int attr = compiler.attribute(ATTR_STD_CURVE_RANDOM);

6
intern/ghost/intern/GHOST_SystemCocoa.mm
View File

@@ -553,10 +553,12 @@ GHOST_TSuccess GHOST_SystemCocoa::init()
// ProcessSerialNumber psn; // ProcessSerialNumber psn;
// Carbon stuff to move window & menu to foreground // Carbon stuff to move window & menu to foreground
/*if (!GetCurrentProcess(&psn)) { #if 0
if (!GetCurrentProcess(&psn)) {
TransformProcessType(&psn, kProcessTransformToForegroundApplication); TransformProcessType(&psn, kProcessTransformToForegroundApplication);
SetFrontProcess(&psn); SetFrontProcess(&psn);
}*/ }
#endif
@autoreleasepool { @autoreleasepool {
[NSApplication sharedApplication]; // initializes NSApp [NSApplication sharedApplication]; // initializes NSApp

10
intern/mikktspace/mikktspace.c
View File

@@ -425,14 +425,15 @@ tbool genTangSpace(const SMikkTSpaceContext *pContext, const float fAngularThres
index = 0; index = 0;
for (f = 0; f < iNrFaces; f++) { for (f = 0; f < iNrFaces; f++) {
const int verts = pContext->m_pInterface->m_getNumVerticesOfFace(pContext, f); const int verts = pContext->m_pInterface->m_getNumVerticesOfFace(pContext, f);
if (verts != 3 && verts != 4) if (verts != 3 && verts != 4) {
continue; continue;
}
// I've decided to let degenerate triangles and group-with-anythings // I've decided to let degenerate triangles and group-with-anythings
// vary between left/right hand coordinate systems at the vertices. // vary between left/right hand coordinate systems at the vertices.
// All healthy triangles on the other hand are built to always be either or. // All healthy triangles on the other hand are built to always be either or.
#if 0
/*// force the coordinate system orientation to be uniform for every face. // force the coordinate system orientation to be uniform for every face.
// (this is already the case for good triangles but not for // (this is already the case for good triangles but not for
// degenerate ones and those with bGroupWithAnything==true) // degenerate ones and those with bGroupWithAnything==true)
bool bOrient = psTspace[index].bOrient; bool bOrient = psTspace[index].bOrient;
@@ -447,7 +448,8 @@ tbool genTangSpace(const SMikkTSpaceContext *pContext, const float fAngularThres
else ++i; else ++i;
} }
if (!bNotFound) bOrient = psTspace[index+i].bOrient; if (!bNotFound) bOrient = psTspace[index+i].bOrient;
}*/ }
#endif
// set data // set data
for (i = 0; i < verts; i++) { for (i = 0; i < verts; i++) {