kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Various warning fixes.

Browse Source
This commit is contained in:
Brecht Van Lommel 2010-03-14 21:25:01 +00:00
parent 9385c46581
commit 14c2fc3c12
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/sequencer.c
View File

@ -2181,7 +2181,7 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
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);

4
source/blender/editors/object/object_bake.c
View File

@ -203,7 +203,7 @@ static void bake_startjob(void *bkv, short *stop, short *do_update)
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 @@ static int bake_image_exec(bContext *C, wmOperator *op)
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);

4
source/blender/makesrna/intern/rna_actuator.c
View File

@ -542,7 +542,7 @@ static void rna_def_property_actuator(BlenderRNA *brna)
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 @@ static void rna_def_constraint_actuator(BlenderRNA *brna)
{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 ..");

4
source/blender/makesrna/intern/rna_sequencer.c
View File

@ -342,7 +342,7 @@ static int rna_Sequence_filepath_length(PointerRNA *ptr)
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 @@ static void rna_SequenceElement_filename_set(PointerRNA *ptr, const char *value)
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)
{

2
source/blender/makesrna/intern/rna_texture.c
View File

@ -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", ""},

1
source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
View File

@ -126,7 +126,6 @@ static void node_composit_exec_channel_matte(void *data, bNode *node, bNodeStack
{
CompBuf *cbuf;
CompBuf *outbuf;
NodeChroma *c=(NodeChroma *)node->storage;
if(in[0]->hasinput==0) return;
if(in[0]->data==NULL) return;