Revision: 27501
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27501
Author: blendix
Date: 2010-03-14 22:25:01 +0100 (Sun, 14 Mar 2010)
Log Message:
-----------
Various warning fixes.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-03-14
21:15:22 UTC (rev 27500)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-03-14
21:25:01 UTC (rev 27501)
@@ -2181,7 +2181,7 @@
else
re= RE_NewRender(sce->id.name,
RE_SLOT_VIEW);
- RE_BlenderFrame(re, sce, sce->lay, NULL, frame);
+ RE_BlenderFrame(re, sce, NULL, sce->lay, frame);
RE_AcquireResultImage(re, &rres);
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c 2010-03-14
21:15:22 UTC (rev 27500)
+++ trunk/blender/source/blender/editors/object/object_bake.c 2010-03-14
21:25:01 UTC (rev 27501)
@@ -203,7 +203,7 @@
RE_test_break_cb(bkr->re, NULL, thread_break);
G.afbreek= 0; /* blender_test_break uses this global */
- RE_Database_Baking(bkr->re, scene, scene->r.bake_mode, bkr->actob,
scene->lay);
+ RE_Database_Baking(bkr->re, scene, scene->lay, scene->r.bake_mode,
bkr->actob);
/* baking itself is threaded, cannot use test_break in threads. we also
update optional imagewindow */
bkr->tot= RE_bake_shade_all_selected(bkr->re, scene->r.bake_mode,
bkr->actob, bkr->do_update);
@@ -301,7 +301,7 @@
RE_test_break_cb(bkr.re, NULL, thread_break);
G.afbreek= 0; /* blender_test_break uses this global */
- RE_Database_Baking(bkr.re, scene, scene->r.bake_mode,
(scene->r.bake_flag & R_BAKE_TO_ACTIVE)? OBACT: NULL, scene->lay);
+ RE_Database_Baking(bkr.re, scene, scene->lay,
scene->r.bake_mode, (scene->r.bake_flag & R_BAKE_TO_ACTIVE)? OBACT: NULL);
/* baking itself is threaded, cannot use test_break in threads
*/
BLI_init_threads(&threads, do_bake_render, 1);
Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c 2010-03-14
21:15:22 UTC (rev 27500)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c 2010-03-14
21:25:01 UTC (rev 27501)
@@ -542,7 +542,7 @@
static void rna_def_constraint_actuator(BlenderRNA *brna)
{
StructRNA *srna;
- PropertyRNA *prop;
+ /*PropertyRNA *prop;
static EnumPropertyItem prop_type_items[] ={
{ACT_CONST_TYPE_LOC, "LOC", 0, "Location Constraint", ""},
@@ -550,7 +550,7 @@
{ACT_CONST_TYPE_ORI, "ORI", 0, "Orientation Constraint", ""},
{ACT_CONST_TYPE_FH, "FH", 0, "Force Field Constraint", ""},
{0, NULL, 0, NULL, NULL}
- };
+ };*/
srna= RNA_def_struct(brna, "ConstraintActuator", "Actuator");
RNA_def_struct_ui_text(srna, "Constraint Actuator", "Actuator to ..");
Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
2010-03-14 21:15:22 UTC (rev 27500)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
2010-03-14 21:25:01 UTC (rev 27501)
@@ -342,7 +342,7 @@
return strlen(path)+1;
}
-static void rna_SoundSequence_filename_set(PointerRNA *ptr, const char *value)
+/*static void rna_SoundSequence_filename_set(PointerRNA *ptr, const char
*value)
{
Sequence *seq= (Sequence*)(ptr->data);
char dir[FILE_MAX], name[FILE_MAX];
@@ -359,7 +359,7 @@
BLI_split_dirfile(value, NULL, name);
BLI_strncpy(elem->name, name, sizeof(elem->name));
-}
+}*/
static void rna_Sequence_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c 2010-03-14
21:15:22 UTC (rev 27500)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c 2010-03-14
21:25:01 UTC (rev 27501)
@@ -43,7 +43,7 @@
#include "BKE_node.h"
-static EnumPropertyItem texture_filter_items[] = {
+EnumPropertyItem texture_filter_items[] = {
{TXF_BOX, "BOX", 0, "Box", ""},
{TXF_EWA, "EWA", 0, "EWA", ""},
{TXF_FELINE, "FELINE", 0, "FELINE", ""},
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
2010-03-14 21:15:22 UTC (rev 27500)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
2010-03-14 21:25:01 UTC (rev 27501)
@@ -126,7 +126,6 @@
{
CompBuf *cbuf;
CompBuf *outbuf;
- NodeChroma *c=(NodeChroma *)node->storage;
if(in[0]->hasinput==0) return;
if(in[0]->data==NULL) return;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
