Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-07-20 08:01:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-07-20 08:01:03 +0300
commitfe2f43a15c648e13fbc5fa4ba24cea41b3671427 (patch)
treeb5f6ec72ba191e8b9b9ec802426e73bd247b3705 /source/blender/io
parent59eb71afa1d11ab0a1d5f741debc6989ec511ff9 (diff)
Cleanup: use '#if 0' for disabling multiple lines
Diffstat (limited to 'source/blender/io')
-rw-r--r--source/blender/io/collada/BCAnimationSampler.cpp10
-rw-r--r--source/blender/io/collada/TransformReader.cpp8
-rw-r--r--source/blender/io/collada/collada_utils.cpp12
-rw-r--r--source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc25
4 files changed, 32 insertions, 23 deletions
diff --git a/source/blender/io/collada/BCAnimationSampler.cpp b/source/blender/io/collada/BCAnimationSampler.cpp
index 02a4e1f3167..d2bde193c0a 100644
--- a/source/blender/io/collada/BCAnimationSampler.cpp
+++ b/source/blender/io/collada/BCAnimationSampler.cpp
@@ -161,10 +161,12 @@ void BCAnimationSampler::update_animation_curves(BCAnimation &animation,
BCSample &BCAnimationSampler::sample_object(Object *ob, int frame_index, bool for_opensim)
{
BCSample &ob_sample = sample_data.add(ob, frame_index);
- // if (export_settings.get_apply_global_orientation()) {
- // const BCMatrix &global_transform = export_settings.get_global_transform();
- // ob_sample.get_matrix(global_transform);
- //}
+#if 0
+ if (export_settings.get_apply_global_orientation()) {
+ const BCMatrix &global_transform = export_settings.get_global_transform();
+ ob_sample.get_matrix(global_transform);
+ }
+#endif
if (ob->type == OB_ARMATURE) {
bPoseChannel *pchan;
diff --git a/source/blender/io/collada/TransformReader.cpp b/source/blender/io/collada/TransformReader.cpp
index 81b0ffc340a..d23f8da2570 100644
--- a/source/blender/io/collada/TransformReader.cpp
+++ b/source/blender/io/collada/TransformReader.cpp
@@ -103,9 +103,11 @@ void TransformReader::dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[
COLLADABU::Math::Vector3 &axis = ro->getRotationAxis();
const float angle = (float)DEG2RAD(ro->getRotationAngle());
const float ax[] = {(float)axis[0], (float)axis[1], (float)axis[2]};
- // float quat[4];
- // axis_angle_to_quat(quat, axis, angle);
- // quat_to_mat4(m, quat);
+#if 0
+ float quat[4];
+ axis_angle_to_quat(quat, axis, angle);
+ quat_to_mat4(m, quat);
+#endif
axis_angle_to_mat4(m, ax, angle);
}
diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp
index 9967a526971..60c4a9bad13 100644
--- a/source/blender/io/collada/collada_utils.cpp
+++ b/source/blender/io/collada/collada_utils.cpp
@@ -1216,8 +1216,10 @@ static bNodeSocket *bc_group_add_input_socket(bNodeTree *ntree,
{
bNodeSocket *to_socket = (bNodeSocket *)BLI_findlink(&to_node->inputs, to_index);
- //bNodeSocket *socket = ntreeAddSocketInterfaceFromSocket(ntree, to_node, to_socket);
- //return socket;
+# if 0
+ bNodeSocket *socket = ntreeAddSocketInterfaceFromSocket(ntree, to_node, to_socket);
+ return socket;
+# endif
bNodeSocket *gsock = ntreeAddSocketInterfaceFromSocket(ntree, to_node, to_socket);
bNode *inputGroup = ntreeFindType(ntree, NODE_GROUP_INPUT);
@@ -1235,8 +1237,10 @@ static bNodeSocket *bc_group_add_output_socket(bNodeTree *ntree,
{
bNodeSocket *from_socket = (bNodeSocket *)BLI_findlink(&from_node->outputs, from_index);
- //bNodeSocket *socket = ntreeAddSocketInterfaceFromSocket(ntree, to_node, to_socket);
- //return socket;
+# if 0
+ bNodeSocket *socket = ntreeAddSocketInterfaceFromSocket(ntree, to_node, to_socket);
+ return socket;
+# endif
bNodeSocket *gsock = ntreeAddSocketInterfaceFromSocket(ntree, from_node, from_socket);
bNode *outputGroup = ntreeFindType(ntree, NODE_GROUP_OUTPUT);
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
index 3b20ac9f110..82f8444d43e 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
@@ -91,19 +91,20 @@ bool GpencilExporterPDF::write()
{
/* Support unicode character paths on Windows. */
HPDF_STATUS res = 0;
- /* TODO: It looks libharu does not support unicode. */
- //#ifdef WIN32
- // char filename_cstr[FILE_MAX];
- // BLI_strncpy(filename_cstr, filename_, FILE_MAX);
- //
- // UTF16_ENCODE(filename_cstr);
- // std::wstring wstr(filename_cstr_16);
- // res = HPDF_SaveToFile(pdf_, wstr.c_str());
- //
- // UTF16_UN_ENCODE(filename_cstr);
- //#else
+
+ /* TODO: It looks `libharu` does not support unicode. */
+#if 0 /* `ifdef WIN32` */
+ char filename_cstr[FILE_MAX];
+ BLI_strncpy(filename_cstr, filename_, FILE_MAX);
+
+ UTF16_ENCODE(filename_cstr);
+ std::wstring wstr(filename_cstr_16);
+ res = HPDF_SaveToFile(pdf_, wstr.c_str());
+
+ UTF16_UN_ENCODE(filename_cstr);
+#else
res = HPDF_SaveToFile(pdf_, filename_);
- //#endif
+#endif
return (res == 0) ? true : false;
}