[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34273] trunk/blender/source/blender: remove redundant assignments & unused vars.
Campbell Barton
ideasman42 at gmail.com
Wed Jan 12 04:41:13 CET 2011
Revision: 34273
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34273
Author: campbellbarton
Date: 2011-01-12 03:41:12 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
remove redundant assignments & unused vars.
also minor functional changes
- OBJECT_OT_make_links_data() type property is now assigned to the operator property (so popup menu can find it)
- removing BG image now returns cancelled if no image is removed.
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenlib/intern/graph.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/object/object_lattice.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_graph/graph_edit.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/imbuf/intern/divers.c
trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_gesture.c
Modified: trunk/blender/source/blender/blenfont/intern/blf.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/blenfont/intern/blf.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -140,7 +140,7 @@
/* check if we already load this font. */
i= blf_search(name);
if (i >= 0) {
- font= global_font[i];
+ /*font= global_font[i];*/ /*UNUSED*/
return(i);
}
@@ -225,7 +225,7 @@
i= blf_search(name);
if (i >= 0) {
- font= global_font[i];
+ /*font= global_font[i];*/ /*UNUSED*/
return(i);
}
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -1795,7 +1795,6 @@
dl->rt= nu->flag & ~CU_2D;
dl->bevelSplitFlag= MEM_callocN(sizeof(*dl->col2)*((bl->nr+0x1F)>>5), "bevelSplitFlag");
- bevp= (BevPoint *)(bl+1);
/* for each point of poly make a bevel piece */
bevp= (BevPoint *)(bl+1);
Modified: trunk/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/font.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/blenkernel/intern/font.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -696,7 +696,7 @@
// Create unicode string
utf8len = utf8slen(cu->str);
- tmp = mem = MEM_callocN(((utf8len + 1) * sizeof(wchar_t)), "convertedmem");
+ mem = MEM_callocN(((utf8len + 1) * sizeof(wchar_t)), "convertedmem");
utf8towchar(mem, cu->str);
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -914,10 +914,10 @@
}
if (scene->r.stamp & R_STAMP_TIME) {
- int h, m, s, f;
- h= m= s= f= 0;
- f = (int)(scene->r.cfra % scene->r.frs_sec);
- s = (int)(scene->r.cfra / scene->r.frs_sec);
+ int f = (int)(scene->r.cfra % scene->r.frs_sec);
+ int s = (int)(scene->r.cfra / scene->r.frs_sec);
+ int h= 0;
+ int m= 0;
if (s) {
m = (int)(s / 60);
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -1229,7 +1229,7 @@
float vel[3];
float k = 0.0f;
float L = s->restlen;
- float cb = clmd->sim_parms->structural;
+ float cb; /* = clmd->sim_parms->structural; */ /*UNUSED*/
float nullf[3] = {0,0,0};
float stretch_force[3] = {0,0,0};
@@ -1566,7 +1566,7 @@
float tm2[3][3] = {{0}};
MFace *mfaces = cloth->mfaces;
unsigned int numverts = cloth->numverts;
- LinkNode *search = cloth->springs;
+ LinkNode *search;
lfVector *winvec;
EffectedPoint epoint;
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -2847,7 +2847,7 @@
ParticleEditSettings *pset = &sim->scene->toolsettings->particle;
ParticleSystem *psys = sim->psys;
ParticleSettings *part = psys->part;
- ParticleCacheKey *ca, **cache= psys->pathcache;
+ ParticleCacheKey *ca, **cache;
DerivedMesh *hair_dm = (psys->part->type==PART_HAIR && psys->flag & PSYS_HAIR_DYNAMICS) ? psys->hair_out_dm : NULL;
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -2025,8 +2025,6 @@
PTCacheMem *pm= pid->cache->mem_cache.first;
PTCacheMem *link= NULL;
- pm= pid->cache->mem_cache.first;
-
if(mode == PTCACHE_CLEAR_ALL) {
/*we want startframe if the cache starts before zero*/
pid->cache->last_exact = MIN2(pid->cache->startframe, 0);
@@ -2207,8 +2205,6 @@
else {
PTCacheMem *pm= pid->cache->mem_cache.first;
- pm= pid->cache->mem_cache.first;
-
while(pm) {
if(pm->frame >= sta && pm->frame <= end)
cache->cached_frames[pm->frame-sta] = 1;
Modified: trunk/blender/source/blender/blenlib/intern/graph.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/graph.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/blenlib/intern/graph.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -410,7 +410,7 @@
BArc * BLI_findConnectedArc(BGraph *graph, BArc *arc, BNode *v)
{
- BArc *nextArc = arc->next;
+ BArc *nextArc;
for(nextArc = graph->arcs.first; nextArc; nextArc = nextArc->next)
{
Modified: trunk/blender/source/blender/editors/armature/editarmature_retarget.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_retarget.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/editors/armature/editarmature_retarget.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -1691,7 +1691,7 @@
void generateMissingArcs(RigGraph *rigg)
{
- ReebGraph *reebg = rigg->link_mesh;
+ ReebGraph *reebg;
int multi_level_limit = 5;
for (reebg = rigg->link_mesh; reebg; reebg = reebg->link_up)
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -2194,7 +2194,7 @@
/* loop over selection segments of a curve, smooth each */
/* Start BezTriple code, this is duplicated below for points, make sure these functions stay in sync */
- start_sel = end_sel = -1;
+ start_sel = -1;
for(bezt=nu->bezt+last_sel, a=last_sel; a<nu->pntsu; a++, bezt++) {
if(bezt->f2 & SELECT) {
start_sel = a;
@@ -2256,7 +2256,7 @@
/* loop over selection segments of a curve, smooth each */
/* Start BezTriple code, this is duplicated below for points, make sure these functions stay in sync */
- start_sel = end_sel = -1;
+ start_sel = -1;
for(bp=nu->bp+last_sel, a=last_sel; a<nu->pntsu; a++, bp++) {
if(bp->f1 & SELECT) {
start_sel = a;
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -3461,7 +3461,7 @@
if(event->type==LEFTMOUSE && event->val==KM_PRESS) {
CurveMapping *cumap= (CurveMapping*)but->poin;
CurveMap *cuma= cumap->cm+cumap->cur;
- CurveMapPoint *cmp= cuma->curve;
+ CurveMapPoint *cmp;
float fx, fy, zoomx, zoomy, offsx, offsy;
float dist, mindist= 200.0f; // 14 pixels radius
int sel= -1;
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -2334,7 +2334,6 @@
void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
{
bScreen *screen= CTX_wm_screen(C);
- Scene *scene= CTX_data_scene(C);
wmWindowManager *wm= CTX_wm_manager(C);
ScrArea *sa= CTX_wm_area(C);
uiBlock *block;
@@ -2352,6 +2351,7 @@
handle_event= B_STOPCOMPO;
}
else {
+ Scene *scene;
/* another scene can be rendering too, for example via compositor */
for(scene= CTX_data_main(C)->scene.first; scene; scene= scene->id.next)
if(WM_jobs_test(wm, scene))
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/editors/interface/resources.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -466,7 +466,7 @@
*/
void ui_theme_init_default(void)
{
- bTheme *btheme= U.themes.first;
+ bTheme *btheme;
/* we search for the theme with name Default */
for(btheme= U.themes.first; btheme; btheme= btheme->next) {
Modified: trunk/blender/source/blender/editors/object/object_lattice.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_lattice.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/editors/object/object_lattice.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -86,8 +86,6 @@
free_editLatt(obedit);
- lt= obedit->data;
-
actkey= ob_get_keyblock(obedit);
if(actkey)
key_to_latt(actkey, lt);
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c 2011-01-12 02:15:38 UTC (rev 34272)
+++ trunk/blender/source/blender/editors/object/object_relations.c 2011-01-12 03:41:12 UTC (rev 34273)
@@ -1338,8 +1338,6 @@
{MAKE_LINKS_MODIFIERS, "MODIFIERS", 0, "Modifiers", ""},
{0, NULL, 0, NULL, NULL}};
- PropertyRNA *prop;
-
/* identifiers */
ot->name= "Link Data";
ot->description = "Make links from the active object to other selected objects";
@@ -1353,7 +1351,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list