Revision: 24482
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24482
Author: aligorith
Date: 2009-11-11 10:59:51 +0100 (Wed, 11 Nov 2009)
Log Message:
-----------
* Fixing various compiler warnings under scons+mingw. Mostly unused variables
and functions.
* Added missing lib-linking code for Grease Pencil in nodetrees
* Uncommented some code for curve shapekeys
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/bvhutils.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/sequence.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
Modified: trunk/blender/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bvhutils.c 2009-11-11
09:58:24 UTC (rev 24481)
+++ trunk/blender/source/blender/blenkernel/intern/bvhutils.c 2009-11-11
09:59:51 UTC (rev 24482)
@@ -492,8 +492,9 @@
t0 = vert[ edge->v1 ].co;
t1 = vert[ edge->v2 ].co;
- closest_to_line_segment_v3(nearest_tmp, co, t0, t1);
- dist = len_v3v3(nearest_tmp, co);
+ // NOTE: casts to "float*" here are due to co being "const float*"
+ closest_to_line_segment_v3(nearest_tmp, (float*)co, t0, t1);
+ dist = len_v3v3(nearest_tmp, (float*)co);
if(dist < nearest->dist)
{
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2009-11-11
09:58:24 UTC (rev 24481)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2009-11-11
09:59:51 UTC (rev 24482)
@@ -726,6 +726,7 @@
return collpair;
}
+#if 0
static int cloth_collision_response_moving( ClothModifierData *clmd,
CollisionModifierData *collmd, CollPair *collpair, CollPair *collision_end )
{
int result = 0;
@@ -834,6 +835,7 @@
}
return result;
}
+#endif
static float projectPointOntoLine(float *p, float *a, float *b)
{
@@ -1065,6 +1067,7 @@
return 0;
}
+#if 0
static int cloth_collision_moving_edges ( ClothModifierData *clmd,
CollisionModifierData *collmd, CollPair *collpair )
{
EdgeCollPair edgecollpair;
@@ -1292,6 +1295,7 @@
return 1;
}
+#endif
// return all collision objects in scene
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2009-11-11
09:58:24 UTC (rev 24481)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2009-11-11
09:59:51 UTC (rev 24482)
@@ -297,6 +297,7 @@
///////////////////////////
// 3x3 matrix
///////////////////////////
+#if 0
/* printf 3x3 matrix on console: for debug output */
static void print_fmatrix(float m3[3][3])
{
@@ -304,6 +305,7 @@
printf("%f\t%f\t%f\n",m3[1][0],m3[1][1],m3[1][2]);
printf("%f\t%f\t%f\n\n",m3[2][0],m3[2][1],m3[2][2]);
}
+#endif
/* copy 3x3 matrix */
DO_INLINE void cp_fmatrix(float to[3][3], float from[3][3])
@@ -972,6 +974,7 @@
}
}
+#if 0
/*
// version 1.3
static int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB,
lfVector *z, fmatrix3x3 *S, fmatrix3x3 *P, fmatrix3x3 *Pinv)
@@ -1143,6 +1146,7 @@
return iterations<conjgrad_looplimit;
}
+#endif
// outer product is NOT cross product!!!
DO_INLINE void dfdx_spring_type1(float to[3][3], float extent[3], float
length, float L, float dot, float k)
Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c 2009-11-11
09:58:24 UTC (rev 24481)
+++ trunk/blender/source/blender/blenkernel/intern/key.c 2009-11-11
09:59:51 UTC (rev 24482)
@@ -1192,11 +1192,11 @@
#endif // XXX old animation system
flag= setkeys(ctime, &key->block, k, t, 0);
-
+
if(flag==0)
- ; /* do_key(a, a+step, tot, (char *)out, key,
k, t, 0); */
+ do_key(a, a+step, tot, (char *)out, key, actkb,
k, t, 0);
else
- ; /* cp_key(a, a+step, tot, (char *)out, key,
k[2],0); */
+ cp_key(a, a+step, tot, (char *)out, key, actkb,
k[2], NULL, 0);
}
}
else {
Modified: trunk/blender/source/blender/blenkernel/intern/sequence.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequence.c 2009-11-11
09:58:24 UTC (rev 24481)
+++ trunk/blender/source/blender/blenkernel/intern/sequence.c 2009-11-11
09:59:51 UTC (rev 24482)
@@ -63,8 +63,8 @@
/* **** XXX ******** */
static int seqrectx= 0; /* bad bad global! */
static int seqrecty= 0;
-static void waitcursor(int val) {}
-static int blender_test_break() {return 0;}
+//static void waitcursor(int val) {}
+//static int blender_test_break() {return 0;}
/* **** XXX ******** */
@@ -1230,6 +1230,7 @@
}
}
+#if 0
static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se,
int cfra,
int build_proxy_run, int render_size);
@@ -1360,6 +1361,7 @@
}
waitcursor(0);
}
+#endif
/* **********************************************************************
@@ -2631,6 +2633,7 @@
return i;
}
+#if 0
/* check used when we need to change seq->blend_mode but not to effect or
audio strips */
static int seq_can_blend(Sequence *seq)
{
@@ -2640,6 +2643,7 @@
return 0;
}
}
+#endif
/* *********************** threading api ******************* */
@@ -2651,8 +2655,8 @@
static pthread_mutex_t wakeup_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t wakeup_cond = PTHREAD_COND_INITIALIZER;
-static pthread_mutex_t prefetch_ready_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t prefetch_ready_cond = PTHREAD_COND_INITIALIZER;
+//static pthread_mutex_t prefetch_ready_lock = PTHREAD_MUTEX_INITIALIZER;
+//static pthread_cond_t prefetch_ready_cond = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t frame_done_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t frame_done_cond = PTHREAD_COND_INITIALIZER;
@@ -2685,6 +2689,7 @@
struct ImBuf * ibuf;
} PrefetchQueueElem;
+#if 0
static void *seq_prefetch_thread(void * This_)
{
PrefetchThread * This = This_;
@@ -2833,6 +2838,7 @@
/* deinit malloc mutex */
BLI_end_threads(0);
}
+#endif
void give_ibuf_prefetch_request(int rectx, int recty, int cfra, int chanshown,
int render_size)
@@ -2859,6 +2865,7 @@
pthread_mutex_unlock(&wakeup_lock);
}
+#if 0
static void seq_wait_for_prefetch_ready()
{
PrefetchThread *tslot;
@@ -2887,6 +2894,7 @@
fprintf(stderr, "SEQ-THREAD: prefetch done\n");
}
+#endif
ImBuf *give_ibuf_seq_threaded(Scene *scene, int rectx, int recty, int cfra,
int chanshown, int render_size)
{
@@ -2993,6 +3001,7 @@
}
}
+#if 0
static void free_imbuf_seq_except(Scene *scene, int cfra)
{
Editing *ed= seq_give_editing(scene, FALSE);
@@ -3042,6 +3051,7 @@
}
SEQ_END
}
+#endif
void free_imbuf_seq(ListBase * seqbase, int check_mem_usage)
{
@@ -3187,6 +3197,7 @@
}
#endif
+#if 0 // XXX old animation system
static void free_imbuf_seq_with_ipo(Scene *scene, struct Ipo *ipo)
{
/* force update of all sequences with this ipo, on ipo changes */
@@ -3206,6 +3217,7 @@
}
SEQ_END
}
+#endif
/* seq funcs's for transforming internally
notice the difference between start/end and left/right.
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2009-11-11
09:58:24 UTC (rev 24481)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2009-11-11
09:59:51 UTC (rev 24482)
@@ -593,7 +593,7 @@
if (ob->soft){
int nofquads;
- float s_shear = ob->soft->shearstiff*ob->soft->shearstiff;
+ //float s_shear = ob->soft->shearstiff*ob->soft->shearstiff;
nofquads = count_mesh_quads(me);
if (nofquads) {
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2009-11-11
09:58:24 UTC (rev 24481)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2009-11-11
09:59:51 UTC (rev 24482)
@@ -332,10 +332,12 @@
bvh_insertionsort(a, begin, end, axis);
}
}
+#if 0
static void sort_along_axis(BVHTree *tree, int start, int end, int axis)
{
sort(tree->nodes, start, end, axis);
}
+#endif
//after a call to this function you can expect one of:
// every node to left of a[n] are smaller or equal to it
@@ -1532,6 +1534,7 @@
}
}
+#if 0
static void iterative_raycast(BVHRayCastData *data, BVHNode *node)
{
while(node)
@@ -1562,6 +1565,7 @@
}
}
}
+#endif
int BLI_bvhtree_ray_cast(BVHTree *tree, const float *co, const float *dir,
float radius, BVHTreeRayHit *hit, BVHTree_RayCastCallback callback, void
*userdata)
{
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-11-11
09:58:24 UTC (rev 24481)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-11-11
09:59:51 UTC (rev 24482)
@@ -10485,6 +10485,9 @@
if(ntree->adt)
expand_animdata(fd, mainvar, ntree->adt);
+
+ if(ntree->gpd)
+ expand_doit(fd, mainvar, ntree->gpd);
for(node= ntree->nodes.first; node; node= node->next)
if(node->id && node->type!=CMP_NODE_R_LAYERS)
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2009-11-11 09:58:24 UTC (rev 24481)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2009-11-11 09:59:51 UTC (rev 24482)
@@ -110,7 +110,7 @@
}
/* ID Search browse menu, open */
-static uiBlock *search_menu(bContext *C, ARegion *ar, void *arg_litem)
+static uiBlock *id_search_menu(bContext *C, ARegion *ar, void *arg_litem)
{
static char search[256];
static TemplateID template;
@@ -262,7 +262,7 @@
type= idptr.type;
if(flag & UI_ID_BROWSE) {
- but= uiDefBlockButN(block, search_menu,
MEM_dupallocN(template), "", 0, 0, UI_UNIT_X*1.6, UI_UNIT_Y, "Browse ID data");
+ but= uiDefBlockButN(block, id_search_menu,
MEM_dupallocN(template), "", 0, 0, UI_UNIT_X*1.6, UI_UNIT_Y, "Browse ID data");
if(type) {
but->icon= RNA_struct_ui_icon(type);
but->flag|= UI_HAS_ICON;
@@ -448,6 +448,8 @@
/********************* RNA Path Builder Template ********************/
+/* ---------- */
+
/* This is creating/editing RNA-Paths
*
* - ptr: struct which holds the path property
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-11-11 09:58:24 UTC (rev 24481)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-11-11 09:59:51 UTC (rev 24482)
@@ -1666,7 +1666,6 @@
{
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
