[Bf-blender-cvs] [21744217cea] blender2.8: Cleanup: remove some #if 0 blocks
Jacques Lucke
noreply at git.blender.org
Wed Oct 17 12:45:17 CEST 2018
Commit: 21744217cea9bb8f767f47cb6c41446563e645ac
Author: Jacques Lucke
Date: Wed Oct 17 12:43:41 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB21744217cea9bb8f767f47cb6c41446563e645ac
Cleanup: remove some #if 0 blocks
Reviewers: brecht, campbellbarton
Differential Revision: https://developer.blender.org/D3802
===================================================================
M source/blender/alembic/intern/alembic_capi.cc
M source/blender/avi/intern/avi.c
M source/blender/blenfont/intern/blf_dir.c
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_text.h
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/bpath.c
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/cloth.c
M source/blender/blenkernel/intern/collision.c
M source/blender/blenkernel/intern/colortools.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/customdata_file.c
M source/blender/blenkernel/intern/editmesh.c
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenkernel/intern/fmodifier.c
===================================================================
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index e295b85afd2..82ebad0bbc2 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -648,39 +648,6 @@ struct ImportJobData {
bool import_ok;
};
-#if 0
-ABC_INLINE bool is_mesh_and_strands(const IObject &object)
-{
- bool has_mesh = false;
- bool has_curve = false;
-
- for (int i = 0; i < object.getNumChildren(); ++i) {
- const IObject &child = object.getChild(i);
-
- if (!child.valid()) {
- continue;
- }
-
- const MetaData &md = child.getMetaData();
-
- if (IPolyMesh::matches(md)) {
- has_mesh = true;
- }
- else if (ISubD::matches(md)) {
- has_mesh = true;
- }
- else if (ICurves::matches(md)) {
- has_curve = true;
- }
- else if (IPoints::matches(md)) {
- has_curve = true;
- }
- }
-
- return has_mesh && has_curve;
-}
-#endif
-
static void import_startjob(void *user_data, short *stop, short *do_update, float *progress)
{
SCOPE_TIMER("Alembic import, objects reading and creation");
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index 6e798a6244e..94f409d2753 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -200,35 +200,6 @@ AviError AVI_print_error(AviError in_error)
return in_error;
}
-#if 0
-void AVI_set_debug(int mode)
-{
- AVI_DEBUG = mode;
-}
-
-bool AVI_is_avi(char *name)
-{
- FILE *fp;
- int ret;
-
- fp = BLI_fopen(name, "rb");
- if (fp == NULL)
- return 0;
-
- if (GET_FCC(fp) != FCC("RIFF") ||
- !GET_FCC(fp) ||
- GET_FCC(fp) != FCC("AVI "))
- {
- ret = 0;
- }
- else {
- ret = 1;
- }
-
- fclose(fp);
- return ret;
-}
-#endif
bool AVI_is_avi(const char *name)
{
@@ -850,14 +821,6 @@ AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...)
movie->streams[i].sh.bottom = 0;
if (movie->streams[i].sh.Type == FCC("vids")) {
-#if 0
- if (movie->streams[i].format == AVI_FORMAT_MJPEG) {
- movie->streams[i].sf = MEM_mallocN(sizeof(AviBitmapInfoHeader) +
- sizeof(AviMJPEGUnknown), "moviestreamformatL");
- movie->streams[i].sf_size = sizeof(AviBitmapInfoHeader) + sizeof(AviMJPEGUnknown);
- }
- else {
-#endif
movie->streams[i].sf = MEM_mallocN(sizeof(AviBitmapInfoHeader), "moviestreamformatS");
movie->streams[i].sf_size = sizeof(AviBitmapInfoHeader);
@@ -874,26 +837,6 @@ AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...)
((AviBitmapInfoHeader *) movie->streams[i].sf)->YPelsPerMeter = 0;
((AviBitmapInfoHeader *) movie->streams[i].sf)->ClrUsed = 0;
((AviBitmapInfoHeader *) movie->streams[i].sf)->ClrImportant = 0;
-
-#if 0
- if (movie->streams[i].format == AVI_FORMAT_MJPEG) {
- AviMJPEGUnknown *tmp;
-
- tmp = (AviMJPEGUnknown *)((char *) movie->streams[i].sf + sizeof(AviBitmapInfoHeader));
-
- tmp->a = 44;
- tmp->b = 24;
- tmp->c = 0;
- tmp->d = 2;
- tmp->e = 8;
- tmp->f = 2;
- tmp->g = 1;
- }
- }
- else if (movie->streams[i].sh.Type == FCC("auds")) {
- /* pass */
- }
-#endif
}
}
diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c
index ff5c1151a82..f37ed3cb54f 100644
--- a/source/blender/blenfont/intern/blf_dir.c
+++ b/source/blender/blenfont/intern/blf_dir.c
@@ -154,32 +154,6 @@ char *blf_dir_search(const char *file)
return s;
}
-#if 0 /* UNUSED */
-int blf_dir_split(const char *str, char *file, int *size)
-{
- int i, len;
- char *s;
-
- /* Window, Linux or Mac, this is always / */
- s = strrchr(str, '/');
- if (s) {
- len = s - str;
- for (i = 0; i < len; i++)
- file[i] = str[i];
-
- file[i] = '.';
- file[i + 1] = 't';
- file[i + 2] = 't';
- file[i + 3] = 'f';
- file[i + 4] = '\0';
- s++;
- *size = atoi(s);
- return 1;
- }
- return 0;
-}
-#endif
-
/* Some font have additional file with metrics information,
* in general, the extension of the file is: .afm or .pfm
*/
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index bdd4c3778f6..baec7e77328 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -491,16 +491,8 @@ void DM_interp_poly_data(
int *src_indices,
float *weights, int count, int dest_index);
-/* UNUSED */
-#if 0
-/** Simple function to get me->totvert amount of vertices/normals,
- * correctly deformed and subsurfered. Needed especially when vertexgroups are involved.
- * In use now by vertex/weight paint and particles */
-DMCoNo *mesh_get_mapped_verts_nors(struct Scene *scene, struct Object *ob);
-#endif
-void mesh_get_mapped_verts_coords(struct Mesh *me_eval, float (*r_cos)[3], const int totcos);
-/* */
+void mesh_get_mapped_verts_coords(struct Mesh *me_eval, float (*r_cos)[3], const int totcos);
DerivedMesh *mesh_create_derived_for_modifier(
struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob,
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 1c73434cde5..f658c07268b 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -224,11 +224,6 @@ short CTX_data_type_get(struct bContextDataResult *result);
bool CTX_data_equals(const char *member, const char *str);
bool CTX_data_dir(const char *member);
-#if 0
-void CTX_data_pointer_set(bContextDataResult *result, void *data);
-void CTX_data_list_add(bContextDataResult *result, void *data);
-#endif
-
#define CTX_DATA_BEGIN(C, Type, instance, member) \
{ \
ListBase ctx_data_list; \
diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index b53af3cec53..e7a8fb1c4a9 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -112,10 +112,6 @@ bool txt_cursor_is_line_end(struct Text *text);
int txt_calc_tab_left(struct TextLine *line, int ch);
int txt_calc_tab_right(struct TextLine *line, int ch);
-#if 0
-void txt_print_undo (struct Text *text);
-#endif
-
/* utility functions, could be moved somewhere more generic but are python/text related */
int text_check_bracket(const char ch);
bool text_check_delim(const char ch);
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index b02b6b6ce15..9f356ab7149 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1467,14 +1467,6 @@ void BKE_keyingsets_free(ListBase *list)
*/
static bool animsys_remap_path(AnimMapper *UNUSED(remap), char *path, char **dst)
{
- /* is there a valid remapping table to use? */
-#if 0
- if (remap) {
- /* find a matching entry... to use to remap */
- /* ...TODO... */
- }
-#endif
-
/* nothing suitable found, so just set dst to look at path (i.e. no alloc/free needed) */
*dst = path;
return false;
@@ -1670,26 +1662,6 @@ static bool animsys_write_rna_setting(PathResolvedRNA *anim_rna, const float val
return false;
}
- /* RNA property update disabled for now - [#28525] [#28690] [#28774] [#28777] */
-#if 0
- /* buffer property update for later flushing */
- if (written && RNA_property_update_check(prop)) {
- short skip_updates_hack = 0;
-
- /* optimization hacks: skip property updates for those properties
- * for we know that which the updates in RNA were really just for
- * flushing property editing via UI/Py
- */
- if (new_ptr.type == &RNA_PoseBone) {
- /* bone transforms - update pose (i.e. tag depsgraph) */
- skip_updates_hack = 1;
- }
-
- if (skip_updates_hack == 0)
- RNA_property_update_cache_add(ptr, prop);
- }
-#endif
-
/* successful */
return true;
}
@@ -2689,19 +2661,6 @@ static void animsys_calculate_nla(Depsgraph *depsgraph, PointerRNA *ptr, AnimDat
/* ***************************************** */
/* Overrides System - Public API */
-/* Clear all overrides */
-
-/* Add or get existing Override for given setting */
-#if 0
-AnimOverride *BKE_animsys_validate_override(PointerRNA *UNUSED(ptr), char *UNUSED(path), int UNUSED(array_index))
-{
- /* FIXME: need to define how to get overrides */
- return NULL;
-}
-#endif
-
-/* -------------------- */
-
/* Evaluate Overrides */
static void animsys_evaluate_overrides(PointerRNA *ptr, AnimData *adt)
{
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 22059a1ff0a..e0caec323c1 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -2212,132 +2212,6 @@ void BKE_pchan_calc_mat(bPoseChannel *pchan)
BKE_pchan_to_mat4(pchan, pchan->chan_mat);
}
-#if 0 /* XXX OLD ANIMSYS, NLASTRIPS ARE NO LONGER USED */
-
-/* NLA strip modifiers */
-static void do_strip_modifiers(Scene *scene, Object *armob, Bone *bone, bPoseChannel *pchan)
-{
- bActionModifier *amod;
- bActionStrip *strip, *strip2;
- float scene_cfra = BKE_scene_frame_get(scene);
- int do_modif;
-
- for (strip = armob->nlastrips.first; strip; strip = strip->next) {
- do_modif = false;
-
- if (scene_cfra >= strip->start && scene_cfra <= strip->end)
- do_modif = true;
-
- if ((scene_cfra > strip->end) && (strip->flag & ACTSTRIP_HOLDLASTFRAME)) {
- do_modif = true;
-
- /* if there are any other strips active, ignore modifiers for this strip -
- * 'hold' option should only hold action modifiers if there are
- * no other active strips */
- for (strip2 = strip->next; strip2; strip2 = strip2->next) {
- if (strip2 == strip) continue;
-
- if (scene_cfra >= strip2->start && scene_cfra <= strip2->end) {
- if (!(strip2->flag & ACTSTRIP_MUTE))
- do_modif = false;
- }
- }
-
- /* if there are any later, activated, strips with 'hold' set, they take precedence,
- * so ignore modifiers for this strip */
- for (strip2 = strip->next; strip2; strip2 = strip2->next) {
- if (scene_cfra < strip2->start) continue;
- if ((strip2->flag & ACTSTRIP_HOLDLASTFRAME) && !
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list