[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34943] trunk/blender/source/blender: Clear some compiler warnings by commenting some functions, adding others to headers.
Campbell Barton
ideasman42 at gmail.com
Thu Feb 17 23:34:44 CET 2011
Revision: 34943
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34943
Author: campbellbarton
Date: 2011-02-17 22:34:41 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
Clear some compiler warnings by commenting some functions, adding others to headers.
left in warnings where functions obviously need to get ported to 2.5x still.
Also, render stamp seq strip works again.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/armature/BIF_retarget.h
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/armature/reeb.h
trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c
trunk/blender/source/blender/editors/include/ED_gpencil.h
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/interface/view2d_ops.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh_loop.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/space_action/action_select.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_file/filelist.h
trunk/blender/source/blender/editors/space_nla/nla_select.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2011-02-17 21:14:54 UTC (rev 34942)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2011-02-17 22:34:41 UTC (rev 34943)
@@ -254,6 +254,7 @@
void seq_single_fix(struct Sequence *seq);
int seq_test_overlap(struct ListBase * seqbasep, struct Sequence *test);
void seq_translate(struct Scene *scene, struct Sequence *seq, int delta);
+struct Sequence *seq_foreground_frame_get(struct Scene *scene, int frame);
struct ListBase *seq_seqbase(struct ListBase *seqbase, struct Sequence *seq);
void seq_offset_animdata(struct Scene *scene, struct Sequence *seq, int ofs);
void seq_dupe_animdata(struct Scene *scene, char *name_from, char *name_to);
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2011-02-17 21:14:54 UTC (rev 34942)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2011-02-17 22:34:41 UTC (rev 34943)
@@ -72,10 +72,9 @@
#include "BKE_packedFile.h"
#include "BKE_scene.h"
#include "BKE_node.h"
+#include "BKE_sequencer.h" /* seq_foreground_frame_get() */
#include "BKE_utildefines.h"
-//XXX #include "BIF_editseq.h"
-
#include "BLF_api.h"
#include "PIL_time.h"
@@ -968,7 +967,7 @@
}
if (scene->r.stamp & R_STAMP_SEQSTRIP) {
- Sequence *seq= NULL; //XXX = get_foreground_frame_seq(scene->r.cfra);
+ Sequence *seq= seq_foreground_frame_get(scene, scene->r.cfra);
if (seq) strcpy(text, seq->name+2);
else strcpy(text, "<none>");
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-02-17 21:14:54 UTC (rev 34942)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-02-17 22:34:41 UTC (rev 34943)
@@ -2965,6 +2965,28 @@
calc_sequence_disp(evil_scene, seq);
}
+Sequence *seq_foreground_frame_get(Scene *scene, int frame)
+{
+ Editing *ed= seq_give_editing(scene, FALSE);
+ Sequence *seq, *best_seq=NULL;
+ int best_machine = -1;
+
+ if(!ed) return NULL;
+
+ for (seq=ed->seqbasep->first; seq; seq= seq->next) {
+ if(seq->flag & SEQ_MUTE || seq->startdisp > frame || seq->enddisp <= frame)
+ continue;
+ /* only use elements you can see - not */
+ if (ELEM5(seq->type, SEQ_IMAGE, SEQ_META, SEQ_SCENE, SEQ_MOVIE, SEQ_COLOR)) {
+ if (seq->machine > best_machine) {
+ best_seq = seq;
+ best_machine = seq->machine;
+ }
+ }
+ }
+ return best_seq;
+}
+
/* return 0 if there werent enough space */
int shuffle_seq(ListBase * seqbasep, Sequence *test, Scene *evil_scene)
{
Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c 2011-02-17 21:14:54 UTC (rev 34942)
+++ trunk/blender/source/blender/editors/animation/keyframing.c 2011-02-17 22:34:41 UTC (rev 34943)
@@ -349,12 +349,12 @@
/* -------------- 'Smarter' Keyframing Functions -------------------- */
/* return codes for new_key_needed */
-static enum {
+enum {
KEYNEEDED_DONTADD = 0,
KEYNEEDED_JUSTADD,
KEYNEEDED_DELPREV,
KEYNEEDED_DELNEXT
-} eKeyNeededStatus;
+} /*eKeyNeededStatus*/;
/* This helper function determines whether a new keyframe is needed */
/* Cases where keyframes should not be added:
@@ -1034,10 +1034,10 @@
/* KEYFRAME MODIFICATION */
/* mode for commonkey_modifykey */
-static enum {
+enum {
COMMONKEY_MODE_INSERT = 0,
COMMONKEY_MODE_DELETE,
-} eCommonModifyKey_Modes;
+} /*eCommonModifyKey_Modes*/;
/* Polling callback for use with ANIM_*_keyframe() operators
* This is based on the standard ED_operator_areaactive callback,
Modified: trunk/blender/source/blender/editors/armature/BIF_retarget.h
===================================================================
--- trunk/blender/source/blender/editors/armature/BIF_retarget.h 2011-02-17 21:14:54 UTC (rev 34942)
+++ trunk/blender/source/blender/editors/armature/BIF_retarget.h 2011-02-17 22:34:41 UTC (rev 34943)
@@ -157,4 +157,8 @@
const char *RIG_nameBone(RigGraph *rg, int arc_index, int bone_index);
void RIG_freeRigGraph(BGraph *rg);
+/* UNUSED */
+void BIF_retargetArmature(bContext *C);
+void BIF_adjustRetarget(bContext *C);
+
#endif /* BIF_RETARGET_H */
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2011-02-17 21:14:54 UTC (rev 34942)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2011-02-17 22:34:41 UTC (rev 34943)
@@ -3392,8 +3392,9 @@
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
+}
+#if 0 // remove this?
static void hide_selected_armature_bones(Scene *scene)
{
Object *obedit= scene->obedit; // XXX get from context
@@ -3412,8 +3413,6 @@
ED_armature_sync_selection(arm->edbo);
}
-
-#if 0 // remove this?
static void hide_unselected_armature_bones(Scene *scene)
{
Object *obedit= scene->obedit; // XXX get from context
@@ -3433,9 +3432,7 @@
ED_armature_validate_active(arm);
ED_armature_sync_selection(arm->edbo);
}
-#endif
-#if 0 // remove this?
void show_all_armature_bones(Scene *scene)
{
Object *obedit= scene->obedit; // XXX get from context
Modified: trunk/blender/source/blender/editors/armature/editarmature_retarget.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_retarget.c 2011-02-17 21:14:54 UTC (rev 34942)
+++ trunk/blender/source/blender/editors/armature/editarmature_retarget.c 2011-02-17 22:34:41 UTC (rev 34943)
@@ -1656,6 +1656,7 @@
}
#endif
+#if 0 /* UNUSED */
static void generateMissingArcsFromNode(RigGraph *rigg, ReebNode *node, int multi_level_limit)
{
while (node->multi_level > multi_level_limit && node->link_up)
@@ -1708,6 +1709,7 @@
}
}
}
+#endif
/************************************ RETARGETTING *****************************************************/
@@ -2799,7 +2801,7 @@
}
}
-static void BIF_retargetArmature(bContext *C)
+void BIF_retargetArmature(bContext *C)
{
ReebGraph *reebg;
double start_time, end_time;
@@ -2932,7 +2934,7 @@
// allqueue(REDRAWVIEW3D, 0);
}
-static void BIF_adjustRetarget(bContext *C)
+void BIF_adjustRetarget(bContext *C)
{
if (GLOBAL_RIGG)
{
Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2011-02-17 21:14:54 UTC (rev 34942)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2011-02-17 22:34:41 UTC (rev 34943)
@@ -76,7 +76,10 @@
GestureApplyFct apply;
} SK_GestureAction;
+#if 0 /* UNUSED 2.5 */
static SK_Point boneSnap;
+#endif
+
static int LAST_SNAP_POINT_VALID = 0;
static float LAST_SNAP_POINT[3];
@@ -727,6 +730,7 @@
return pt;
}
+#if 0 /* UNUSED 2.5 */
static SK_Point *sk_snapPointArmature(bContext *C, Object *ob, ListBase *ebones, short mval[2], int *dist)
{
ARegion *ar = CTX_wm_region(C);
@@ -774,6 +778,7 @@
return pt;
}
+#endif
void sk_resetOverdraw(SK_Sketch *sketch)
{
@@ -2198,6 +2203,7 @@
return 0;
}
+#if 0 /* UNUSED 2.5 */
static void sk_queueRedrawSketch(SK_Sketch *sketch)
{
if (sketch->active_stroke != NULL)
@@ -2211,6 +2217,7 @@
}
}
}
+#endif
static void sk_drawSketch(Scene *scene, View3D *UNUSED(v3d), SK_Sketch *sketch, int with_names)
{
Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c 2011-02-17 21:14:54 UTC (rev 34942)
+++ trunk/blender/source/blender/editors/armature/poseobject.c 2011-02-17 22:34:41 UTC (rev 34943)
@@ -71,13 +71,6 @@
#include "armature_intern.h"
-/* ************* XXX *************** */
-static int pupmenu(const char *UNUSED(dummy)) {return 0;}
-static void error(const char *UNUSED(dummy)) {}
-static void BIF_undo_push(const char *UNUSED(dummy)) {}
-/* ************* XXX *************** */
-
-
static int object_pose_context(Object *ob)
{
if( (ob) &&
@@ -167,6 +160,7 @@
/* if a selected or active bone is protected, throw error (oonly if warn==1) and return 1 */
/* only_selected==1 : the active bone is allowed to be protected */
+#if 0 /* UNUSED 2.5 */
static short pose_has_protected_selected(Object *ob, short warn)
{
/* check protection */
@@ -189,6 +183,7 @@
}
return 0;
}
+#endif
/* only for real IK, not for auto-IK */
static int pose_channel_in_IK_chain(Object *ob, bPoseChannel *pchan, int level)
@@ -662,7 +657,7 @@
}
/* ********************************************** */
-
+#if 0 /* UNUSED 2.5 */
static void pose_copy_menu(Scene *scene)
{
Object *obedit= scene->obedit; // XXX context
@@ -860,6 +855,7 @@
BIF_undo_push("Copy Pose Attributes");
}
+#endif
/* ******************** copy/paste pose ********************** */
Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c 2011-02-17 21:14:54 UTC (rev 34942)
+++ trunk/blender/source/blender/editors/armature/reeb.c 2011-02-17 22:34:41 UTC (rev 34943)
@@ -59,9 +59,10 @@
#include "reeb.h"
-
+#if 0 /* UNUSED 2.5 */
static ReebGraph *GLOBAL_RG = NULL;
static ReebGraph *FILTERED_RG = NULL;
+#endif
/*
* Skeleton generation algorithm based on:
@@ -496,7 +497,7 @@
}
}
-static void verifyNodeDegree(ReebGraph *rg)
+void verifyNodeDegree(ReebGraph *rg)
{
#ifdef DEBUG_REEB
ReebNode *node = NULL;
@@ -578,7 +579,7 @@
#endif
}
-static void verifyArcs(ReebGraph *rg)
+void verifyArcs(ReebGraph *rg)
{
ReebArc *arc;
@@ -625,6 +626,7 @@
interp_v3_v3v3(b->p, b->p, co, 1.0f / b->nv);
}
+#if 0 /* UNUSED 2.5 */
static void removeVertFromBucket(EmbedBucket *b, float co[3])
{
mul_v3_fl(b->p, (float)b->nv);
@@ -632,6 +634,7 @@
b->nv--;
mul_v3_fl(b->p, 1.0f / (float)b->nv);
}
+#endif
static void mergeBuckets(EmbedBucket *bDst, EmbedBucket *bSrc)
{
Modified: trunk/blender/source/blender/editors/armature/reeb.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list