[Bf-blender-cvs] [41216d5ad4c] blender2.8: Cleanup: Remove more #if 0 blocks
Jacques Lucke
noreply at git.blender.org
Thu Oct 18 15:43:50 CEST 2018
Commit: 41216d5ad4c722e2ad9f15c968af454fc7566d5e
Author: Jacques Lucke
Date: Thu Oct 18 15:43:06 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB41216d5ad4c722e2ad9f15c968af454fc7566d5e
Cleanup: Remove more #if 0 blocks
Continuation of https://developer.blender.org/D3802
Reviewers: brecht
Differential Revision: https://developer.blender.org/D3808
===================================================================
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/mask.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/mesh_validate.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/multires.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/ocean.c
M source/blender/blenkernel/intern/packedFile.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_child.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/pbvh_bmesh.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/seqeffects.c
M source/blender/blenkernel/intern/seqmodifier.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenkernel/intern/unit.c
M source/blender/blenkernel/intern/writeffmpeg.c
M source/blender/blenlib/BLI_math_solvers.h
M source/blender/blenlib/BLI_math_statistics.h
M source/blender/blenlib/intern/BLI_array.c
M source/blender/blenlib/intern/BLI_ghash.c
M source/blender/blenlib/intern/BLI_ghash_utils.c
M source/blender/blenlib/intern/BLI_heap.c
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/array_store_utils.c
M source/blender/blenlib/intern/edgehash.c
M source/blender/blenlib/intern/freetypefont.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/math_interp.c
M source/blender/blenlib/intern/noise.c
M source/blender/blenlib/intern/path_util.c
M source/blender/blenlib/intern/scanfill.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index b7885e08a60..723d485ea0f 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2670,11 +2670,6 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal)
ima->name[0] = '\0';
}
-#if 0
- /* force reload on first use, but not for multilayer, that makes nodes and buttons in ui drawing fail */
- if (ima->type != IMA_TYPE_MULTILAYER)
- BKE_image_free_buffers(ima);
-#else
/* image buffers for non-sequence multilayer will share buffers with RenderResult,
* however sequence multilayer will own buffers. Such logic makes switching from
* single multilayer file to sequence completely unstable
@@ -2683,7 +2678,6 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal)
* sequences behave stable
*/
BKE_image_free_buffers(ima);
-#endif
ima->ok = 1;
if (iuser)
@@ -4468,15 +4462,6 @@ bool BKE_image_is_dirty(Image *image)
void BKE_image_file_format_set(Image *image, int ftype, const ImbFormatOptions *options)
{
-#if 0
- ImBuf *ibuf = BKE_image_acquire_ibuf(image, NULL, NULL);
- if (ibuf) {
- ibuf->ftype = ftype;
- ibuf->foptions = options;
- }
- BKE_image_release_ibuf(image, ibuf, NULL);
-#endif
-
BLI_spin_lock(&image_spin);
if (image->cache != NULL) {
struct MovieCacheIter *iter = IMB_moviecacheIter_new(image->cache);
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 84aa0ed962b..a34ebcd9fde 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1982,15 +1982,6 @@ bool new_id(ListBase *lb, ID *id, const char *tname)
result = check_for_dupid(lb, id, name);
strcpy(id->name + 2, name);
- /* This was in 2.43 and previous releases
- * however all data in blender should be sorted, not just duplicate names
- * sorting should not hurt, but noting just incase it alters the way other
- * functions work, so sort every time */
-#if 0
- if (result)
- id_sort_by_name(lb, id);
-#endif
-
id_sort_by_name(lb, id);
return result;
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 7938d82eb80..e82e1cf2d6b 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -1064,14 +1064,8 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used)
return (ELEM(id_type_used, ID_OB, ID_WO, ID_SCE, ID_MC, ID_MA, ID_GR, ID_TXT,
ID_LS, ID_MSK, ID_SO, ID_GD, ID_BR, ID_PAL, ID_IM, ID_NT));
case ID_OB:
- /* Could be the following, but simpler to just always say 'yes' here. */
-#if 0
- return ELEM(id_type_used, ID_ME, ID_CU, ID_MB, ID_LT, ID_SPK, ID_AR, ID_LA, ID_CA, /* obdata */
- ID_OB, ID_MA, ID_GD, ID_GR, ID_TE, ID_PA, ID_TXT, ID_SO, ID_MC, ID_IM, ID_AC
- /* + constraints and modifiers ... */);
-#else
+ /* Could be more specific, but simpler to just always say 'yes' here. */
return true;
-#endif
case ID_ME:
return ELEM(id_type_used, ID_ME, ID_KE, ID_MA, ID_IM);
case ID_CU:
@@ -1099,12 +1093,8 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used)
case ID_GR:
return ELEM(id_type_used, ID_OB, ID_GR);
case ID_NT:
- /* Could be the following, but node.id has no type restriction... */
-#if 0
- return ELEM(id_type_used, ID_GD /* + node.id types... */);
-#else
+ /* Could be more specific, but node.id has no type restriction... */
return true;
-#endif
case ID_BR:
return ELEM(id_type_used, ID_BR, ID_IM, ID_PC, ID_TE, ID_MA);
case ID_PA:
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index ba5a6a25048..97058467fd9 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -1419,34 +1419,6 @@ void BKE_mask_evaluate(Mask *mask, const float ctime, const bool do_newframe)
* for now re-evaluate all. eventually this might work differently */
void BKE_mask_update_display(Mask *mask, float ctime)
{
-#if 0
- MaskLayer *masklay;
-
- for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
- MaskSpline *spline;
-
- for (spline = masklay->splines.first; spline; spline = spline->next) {
- if (spline->points_deform) {
- int i = 0;
-
- for (i = 0; i < spline->tot_point; i++) {
- MaskSplinePoint *point;
-
- if (spline->points_deform) {
- point = &spline->points_deform[i];
- BKE_mask_point_free(point);
- }
- }
- if (spline->points_deform) {
- MEM_freeN(spline->points_deform);
- }
-
- spline->points_deform = NULL;
- }
- }
- }
-#endif
-
BKE_mask_evaluate(mask, ctime, false);
}
@@ -1657,19 +1629,6 @@ MaskLayerShape *BKE_mask_layer_shape_verify_frame(MaskLayer *masklay, const int
BKE_mask_layer_shape_sort(masklay);
}
-#if 0
- {
- MaskLayerShape *masklay_shape;
- int i = 0;
- for (masklay_shape = masklay->splines_shapes.first;
- masklay_shape;
- masklay_shape = masklay_shape->next)
- {
- printf("mask %d, %d\n", i++, masklay_shape->frame);
- }
- }
-#endif
-
return masklay_shape;
}
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c
index 2f2b82a00eb..fc1412c1baa 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -749,12 +749,6 @@ void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle, struct Mask *mas
for (j = 0; j < tot_diff_feather_points; j++) {
copy_v2_v2(co_feather, diff_feather_points[j]);
sf_vert = BLI_scanfill_vert_add(&sf_ctx, co_feather);
-
- /* no need for these attrs */
-#if 0
- sf_vert->tmp.u = sf_vert_tot;
- sf_vert->keyindex = sf_vert_tot + tot_diff_point; /* absolute index of feather vert */
-#endif
sf_vert->keyindex = SF_KEYINDEX_TEMP_ID;
sf_vert_tot++;
}
@@ -1206,18 +1200,6 @@ void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle, struct Mask *mas
/* functions that run inside the sampling thread (keep fast!) */
/* --------------------------------------------------------------------- */
-/* 2D ray test */
-#if 0
-static float maskrasterize_layer_z_depth_tri(const float pt[2],
- const float v1[3], const float v2[3], const float v3[3])
-{
- float w[3];
- barycentric_weights_v2(v1, v2, v3, pt, w);
- return (v1[2] * w[0]) + (v2[2] * w[1]) + (v3[2] * w[2]);
-}
-#endif
-
-#if 1
static float maskrasterize_layer_z_depth_quad(const float pt[2],
const float v1[3], const float v2[3], const float v3[3], const float v4[3])
{
@@ -1226,33 +1208,16 @@ static float maskrasterize_layer_z_depth_quad(const float pt[2],
//return (v1[2] * w[0]) + (v2[2] * w[1]) + (v3[2] * w[2]) + (v4[2] * w[3]);
return w[2] + w[3]; /* we can make this assumption for small speedup */
}
-#endif
static float maskrasterize_layer_isect(unsigned int *face, float (*cos)[3], const float dist_orig, const float xy[2])
{
/* we always cast from same place only need xy */
if (face[3] == TRI_VERT) {
/* --- tri --- */
-
-#if 0
- /* not essential but avoids unneeded extra lookups */
- if ((cos[0][2] < dist_orig) ||
- (cos[1][2] < dist_orig) ||
- (cos[2][2] < dist_orig))
- {
- if (isect_point_tri_v2_cw(xy, cos[face[0]], cos[face[1]], cos[face[2]])) {
- /* we know all tris are close for now */
- return maskrasterize_layer_z_depth_tri(xy, cos[face[0]], cos[face[1]], cos[face[2]]);
- }
- }
-#else
/* we know all tris are close for now */
- if (1) {
- if (isect_point_tri_v2_cw(xy, cos[face[0]], cos[face[1]], cos[face[2]])) {
- return 0.0f;
- }
+ if (isect_point_tri_v2_cw(xy, cos[face[0]], cos[face[1]], cos[face[2]])) {
+ return 0.0f;
}
-#endif
}
else {
/* --- quad --- */
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index a46f7bf26dc..d5558f64be8 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -653,14 +653,6 @@ void assign_material_id(Main *bmain, ID *id, Material *ma, short act)
if (act > MAXMAT) return;
if (act < 1) act = 1;
- /* this is needed for Python overrides,
- * we just have to take care that the UI can't do this */
-#if 0
- /* prevent crashing when using accidentally */
- BLI_assert(id->lib == NULL);
- if (id->lib) return;
-#endif
-
/* test arraylens */
totcolp = give_totcolp_id(id);
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 5e4f5614370..9b2c2e938d4 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -224,15 +224,7 @@ void BKE_mball_texspace_calc(Object *ob)
min[0] = min[1] = min[2] = -1.0f;
max[0] = max[1] = max[2] = 1.0f;
}
-#if 0
- loc[0] = (min[0] + max[0]) / 2.0f;
- loc[1] = (min[1] + max[1]) / 2.0f;
- loc[2] = (min[2] + max[2]) / 2.0f;
-
- size[0] = (max[0] - min[0]) / 2.0f;
- size[1] = (max[1] - min[1]) / 2.0f;
- size[2] = (max[2] - min[2]) / 2.0f;
-#endif
+
BKE_boundbox_init_from_minmax(bb, min, max);
bb->flag &= ~BOUNDBOX_DIRTY;
diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c
index 7e26a0f7713..436f5cc8afd 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.c
+++ b/source/blender/blenkernel/intern/mball_tessellate.c
@@ -839,27 +839,6 @@ static void vnormal(PROCESS *process, const float point[3], float r_no[3])
r_no[0] = metaball(process, point[0] + delta, point[1], point[2]) - f;
r_no[1] = metaball(process, point[0], point[1] + delta, point[2]) - f;
r_no[2] = metaball(process, point[0], point[1], point[2] + delta) - f;
-
-#if 0
- f = normalize_v3(r_no);
-
- if (0) {
- float tvec[3];
-
- delta *= 2.0f;
-
- f = process->function(process,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list