quiet various warnings, also disable -Wdouble-promotion with cmake since it gives...
authorCampbell Barton <ideasman42@gmail.com>
Sun, 3 Apr 2011 10:04:16 +0000 (10:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 3 Apr 2011 10:04:16 +0000 (10:04 +0000)
39 files changed:
CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenlib/BLI_utildefines.h
source/blender/editors/interface/interface_icons.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/space_action/action_ops.c
source/blender/editors/space_graph/graph_ops.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_scopes.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/gpu/intern/gpu_draw.c
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_define.c
source/blender/makesrna/intern/rna_gpencil.c
source/blender/makesrna/intern/rna_wm_api.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/nodes/intern/TEX_nodes/TEX_at.c
source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
source/blender/nodes/intern/TEX_nodes/TEX_checker.c
source/blender/nodes/intern/TEX_nodes/TEX_compose.c
source/blender/nodes/intern/TEX_nodes/TEX_coord.c
source/blender/nodes/intern/TEX_nodes/TEX_curves.c
source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
source/blender/nodes/intern/TEX_nodes/TEX_distance.c
source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
source/blender/nodes/intern/TEX_nodes/TEX_image.c
source/blender/nodes/intern/TEX_nodes/TEX_invert.c
source/blender/nodes/intern/TEX_nodes/TEX_math.c
source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
source/blender/nodes/intern/TEX_nodes/TEX_output.c
source/blender/nodes/intern/TEX_nodes/TEX_proc.c
source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
source/blender/nodes/intern/TEX_nodes/TEX_texture.c
source/blender/nodes/intern/TEX_nodes/TEX_translate.c
source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
source/blender/python/intern/bpy_rna.h
source/blender/python/intern/bpy_rna_anim.c

index 15a5071accc6aeda8268909a5fb1215917b47a78..b2243e6bd747a3493644d6a516292228a569417d 100644 (file)
@@ -1059,7 +1059,8 @@ if(CMAKE_COMPILER_IS_GNUCC)
        ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
        ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
        ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
-       ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
+       # disable because it gives warnings for printf() & friends.
+       # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
        ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
 
        ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
index 1c6221eba8bf1e89c2cdd4f47206dc292d6a33a5..2708239a4c37ef307dfcda0da43631004c7ecac9 100644 (file)
@@ -1851,7 +1851,7 @@ void nladata_flush_channels (ListBase *channels)
  * ! This is exported so that keyframing code can use this for make use of it for anim layers support
  * > echannels: (list<NlaEvalChannels>) evaluation channels with calculated values
  */
-void animsys_evaluate_nla (ListBase *echannels, PointerRNA *ptr, AnimData *adt, float ctime) 
+static void animsys_evaluate_nla (ListBase *echannels, PointerRNA *ptr, AnimData *adt, float ctime)
 {
        NlaTrack *nlt;
        short track_index=0;
index bee5c031fc97084dfb88ccc14c10e4db70235068..a376d04841254608687b740486b7160a512247fd 100644 (file)
 #  ifdef __GNUC__ /* just want to check if __func__ is available */
 #    define BLI_assert(a) \
 do { \
-       if (0 == (a)) { \
+       if (!(a)) { \
                fprintf(stderr, \
                        "BLI_assert failed: %s, %s(), %d at \'%s\'\n", \
                        __FILE__, __func__, __LINE__, STRINGIFY(a)); \
index 77757cce61c09b51a481f372ec5b2ffe3defe734..37af293e3aad8aa4f334ee4406cf8991f9a1f6de 100644 (file)
@@ -129,7 +129,7 @@ typedef struct IconTexture {
 /* ******************* STATIC LOCAL VARS ******************* */
 /* static here to cache results of icon directory scan, so it's not 
  * scanning the filesystem each time the menu is drawn */
-static struct ListBase iconfilelist = {0, 0};
+static struct ListBase iconfilelist = {NULL, NULL};
 static IconTexture icongltex = {0, 0, 0, 0.0f, 0.0f};
 
 /* **************************************************** */
@@ -144,7 +144,7 @@ static void def_internal_icon(ImBuf *bbuf, int icon_id, int xofs, int yofs, int
 
        new_icon = MEM_callocN(sizeof(Icon), "texicon");
 
-       new_icon->obj = 0; /* icon is not for library object */
+       new_icon->obj = NULL; /* icon is not for library object */
        new_icon->type = 0;     
 
        di = MEM_callocN(sizeof(DrawInfo), "drawinfo");
@@ -184,14 +184,14 @@ static void def_internal_vicon( int icon_id, VectorDrawFunc drawFunc)
 
        new_icon = MEM_callocN(sizeof(Icon), "texicon");
 
-       new_icon->obj = 0; /* icon is not for library object */
+       new_icon->obj = NULL; /* icon is not for library object */
        new_icon->type = 0;
 
        di = MEM_callocN(sizeof(DrawInfo), "drawinfo");
        di->type= ICON_TYPE_VECTOR;
        di->data.vector.func =drawFunc;
 
-       new_icon->drawinfo_free = 0;
+       new_icon->drawinfo_free = NULL;
        new_icon->drawinfo = di;
 
        BKE_icon_set(icon_id, new_icon);
@@ -667,7 +667,7 @@ static void init_iconfile_list(struct ListBase *list)
                if (dir[i].string) MEM_freeN(dir[i].string);
        }
        free(dir);
-       dir= 0;
+       dir= NULL;
 }
 
 static void free_iconfile_list(struct ListBase *list)
index c4c30df87ed91074d632aeb1c4e099513c46912b..4aa9b942cf3421f838ba246e61e3618990292e93 100644 (file)
@@ -809,7 +809,7 @@ static void fluidbake_free_data(FluidAnimChannels *channels, ListBase *fobjects,
        }
 }
 
-int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain)
+static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain)
 {
        Scene *scene= CTX_data_scene(C);
        int i;
index e07efcadb6591fc211d57d04a61feb846d1fe21b..6c3f80cda4152cc33c39bc6def810755bfecae15 100644 (file)
@@ -39,8 +39,7 @@
 
 #include "BLI_blenlib.h"
 
-
-
+#include "ED_anim_api.h"
 #include "ED_transform.h"
 
 #include "action_intern.h"
index e75fbeb8efc48f6da4d12dc30378c31a3883f44c..8510446768dc4766ab800f0321255221a3d64c43 100644 (file)
@@ -45,6 +45,7 @@
 
 #include "UI_view2d.h"
 
+#include "ED_anim_api.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
 
index 048581e207ed6cbc472dc2e4084d4d55aa0cb157..115d1ad7bae2af3d6f03ca61ae3d2d19cc21c168 100644 (file)
@@ -337,7 +337,7 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, short mval[2])
                }
                seq= seq->next;
        }
-       return 0;
+       return NULL;
 }
 
 
@@ -461,12 +461,12 @@ static void reload_image_strip(Scene *scene, char *UNUSED(name))
 
 
 
-       if(last_seq==0 || last_seq->type!=SEQ_IMAGE) return;
+       if(last_seq==NULL || last_seq->type!=SEQ_IMAGE) return;
        seqact= last_seq;       /* last_seq changes in alloc_sequence */
 
        /* search sfile */
 //     sfile= scrarea_find_space_of_type(curarea, SPACE_FILE);
-       if(sfile==0) return;
+       if(sfile == NULL) return;
 
        waitcursor(1);
 
@@ -479,7 +479,7 @@ static void reload_image_strip(Scene *scene, char *UNUSED(name))
                seqact->len= seq->len;
                calc_sequence(scene, seqact);
 
-               seq->strip= 0;
+               seq->strip= NULL;
                seq_free_sequence(scene, seq);
                BLI_remlink(ed->seqbasep, seq);
 
@@ -497,7 +497,7 @@ static void change_sequence(Scene *scene)
        Scene *sce;
        short event;
 
-       if(last_seq==0) return;
+       if(last_seq == NULL) return;
 
        if(last_seq->type & SEQ_EFFECT) {
                event = pupmenu("Change Effect%t"
@@ -590,7 +590,7 @@ static void change_sequence(Scene *scene)
 int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequence **selseq1, Sequence **selseq2, Sequence **selseq3, const char **error_str)
 {
        Editing *ed = seq_give_editing(scene, FALSE);
-       Sequence *seq1= 0, *seq2= 0, *seq3= 0, *seq;
+       Sequence *seq1= NULL, *seq2= NULL, *seq3= NULL, *seq;
        
        *error_str= NULL;
 
@@ -604,9 +604,9 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen
                                return 0;
                        }
                        if((seq != activeseq) && (seq != seq2)) {
-                                                               if(seq2==0) seq2= seq;
-                                                               else if(seq1==0) seq1= seq;
-                                                               else if(seq3==0) seq3= seq;
+                                                               if(seq2 == NULL) seq2= seq;
+                                                               else if(seq1 == NULL) seq1= seq;
+                                                               else if(seq3 == NULL) seq3= seq;
                                                                else {
                                                                        *error_str= "Can't apply effect to more than 3 sequence strips";
                                                                        return 0;
@@ -617,7 +617,7 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen
        
        /* make sequence selection a little bit more intuitive
           for 3 strips: the last-strip should be sequence3 */
-       if (seq3 != 0 && seq2 != 0) {
+       if (seq3 != NULL && seq2 != NULL) {
                Sequence *tmp = seq2;
                seq2 = seq3;
                seq3 = tmp;
@@ -626,21 +626,21 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen
 
        switch(get_sequence_effect_num_inputs(type)) {
        case 0:
-               *selseq1 = *selseq2 = *selseq3 = 0;
+               *selseq1 = *selseq2 = *selseq3 = NULL;
                return 1; /* succsess */
        case 1:
-               if(seq2==0)  {
+               if(seq2==NULL)  {
                        *error_str= "Need at least one selected sequence strip";
                        return 0;
                }
-               if(seq1==0) seq1= seq2;
-               if(seq3==0) seq3= seq2;
+               if(seq1==NULL) seq1= seq2;
+               if(seq3==NULL) seq3= seq2;
        case 2:
-               if(seq1==0 || seq2==0) {
+               if(seq1==NULL || seq2==NULL) {
                        *error_str= "Need 2 selected sequence strips";
                        return 0;
                }
-               if(seq3==0) seq3= seq2;
+               if(seq3 == NULL) seq3= seq2;
        }
        
        if (seq1==NULL && seq2==NULL && seq3==NULL) {
@@ -722,7 +722,7 @@ static void recurs_del_seq_flag(Scene *scene, ListBase *lb, short flag, short de
 static Sequence *cut_seq_hard(Scene *scene, Sequence * seq, int cutframe)
 {
        TransSeq ts;
-       Sequence *seqn = 0;
+       Sequence *seqn = NULL;
        int skip_dup = FALSE;
 
        /* backup values */
@@ -816,7 +816,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence * seq, int cutframe)
 static Sequence *cut_seq_soft(Scene *scene, Sequence * seq, int cutframe)
 {
        TransSeq ts;
-       Sequence *seqn = 0;
+       Sequence *seqn = NULL;
        int skip_dup = FALSE;
 
        /* backup values */
@@ -2013,8 +2013,8 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op))
 
        BLI_movelisttolist(ed->seqbasep, &last_seq->seqbase);
 
-       last_seq->seqbase.first= 0;
-       last_seq->seqbase.last= 0;
+       last_seq->seqbase.first= NULL;
+       last_seq->seqbase.last= NULL;
 
        BLI_remlink(ed->seqbasep, last_seq);
        seq_free_sequence(scene, last_seq);
index 49ad1e2825c0c688dc98ff2b19e3f0609a8c7e9a..b617d012237318f3a85efa4fd0ee19a6688a80ac 100644 (file)
@@ -167,7 +167,7 @@ static struct ImBuf *make_waveform_view_from_ibuf_byte(struct ImBuf * ibuf)
        }
 
        for (y = 0; y < ibuf->y; y++) {
-               unsigned char * last_p = 0;
+               unsigned char * last_p = NULL;
 
                for (x = 0; x < ibuf->x; x++) {
                        unsigned char * rgb = src + 4 * (ibuf->x * y + x);
@@ -182,7 +182,7 @@ static struct ImBuf *make_waveform_view_from_ibuf_byte(struct ImBuf * ibuf)
                        p += 4 * w;
                        scope_put_pixel(wtable, p);
 
-                       if (last_p != 0) {
+                       if (last_p != NULL) {
                                wform_put_line(w, last_p, p);
                        }
                        last_p = p;
@@ -213,7 +213,7 @@ static struct ImBuf *make_waveform_view_from_ibuf_float(struct ImBuf * ibuf)
        }
 
        for (y = 0; y < ibuf->y; y++) {
-               unsigned char * last_p = 0;
+               unsigned char * last_p = NULL;
 
                for (x = 0; x < ibuf->x; x++) {
                        float * rgb = src + 4 * (ibuf->x * y + x);
@@ -231,7 +231,7 @@ static struct ImBuf *make_waveform_view_from_ibuf_float(struct ImBuf * ibuf)
                        p += 4 * w;
                        scope_put_pixel(wtable, p);
 
-                       if (last_p != 0) {
+                       if (last_p != NULL) {
                                wform_put_line(w, last_p, p);
                        }
                        last_p = p;
@@ -274,7 +274,7 @@ static struct ImBuf *make_sep_waveform_view_from_ibuf_byte(struct ImBuf * ibuf)
        }
 
        for (y = 0; y < ibuf->y; y++) {
-               unsigned char * last_p[3] = {0,0,0};
+               unsigned char *last_p[3] = {NULL, NULL, NULL};
 
                for (x = 0; x < ibuf->x; x++) {
                        int c;
@@ -288,7 +288,7 @@ static struct ImBuf *make_sep_waveform_view_from_ibuf_byte(struct ImBuf * ibuf)
                                p += 4 * w;
                                scope_put_pixel_single(wtable, p, c);
 
-                               if (last_p[c] != 0) {
+                               if (last_p[c] != NULL) {
                                        wform_put_line_single(
                                                w, last_p[c], p, c);
                                }
@@ -324,7 +324,7 @@ static struct ImBuf *make_sep_waveform_view_from_ibuf_float(
        }
 
        for (y = 0; y < ibuf->y; y++) {
-               unsigned char * last_p[3] = {0, 0, 0};
+               unsigned char *last_p[3] = {NULL, NULL, NULL};
 
                for (x = 0; x < ibuf->x; x++) {
                        int c;
@@ -342,7 +342,7 @@ static struct ImBuf *make_sep_waveform_view_from_ibuf_float(
                                p += 4 * w;
                                scope_put_pixel_single(wtable, p, c);
 
-                               if (last_p[c] != 0) {
+                               if (last_p[c] != NULL) {
                                        wform_put_line_single(
                                                w, last_p[c], p, c);
                                }
index d6ed9752d030fc23de168adb68e31d1d3991de9f..8f8b46d07ada06ab95a570514c7a500a5f8f1793 100644 (file)
@@ -1696,7 +1696,7 @@ static void RestoreState(bContext *C, wmWindow *win)
 }
 
 /* was space_set_commmandline_options in 2.4x */
-void game_set_commmandline_options(GameData *gm)
+static void game_set_commmandline_options(GameData *gm)
 {
        SYS_SystemHandle syshandle;
        int test;
index 510ae31db514fe1efe4be82a9468d7eb052f611a..200b42526f0cf1f667d72b5cec7c75c192adac59 100644 (file)
@@ -106,7 +106,7 @@ void GPU_render_text(MTFace *tface, int mode,
                        line_height= MAX4(v1[1], v2[1], v3[1], v4[2]) - MIN4(v1[1], v2[1], v3[1], v4[2]);
                else
                        line_height= MAX3(v1[1], v2[1], v3[1]) - MIN3(v1[1], v2[1], v3[1]);
-               line_height *= 1.2; /* could be an option? */
+               line_height *= 1.2f; /* could be an option? */
                /* end multiline */
 
                
@@ -358,7 +358,7 @@ static void gpu_set_blend_mode(GPUBlendMode blendmode)
                 * turn off alpha test in this case */
 
                /* added after 2.45 to clip alpha */
-               if(U.glalphaclip == 1.0) {
+               if(U.glalphaclip == 1.0f) {
                        glDisable(GL_ALPHA_TEST);
                }
                else {
@@ -1288,8 +1288,8 @@ int GPU_scene_object_lights(Scene *scene, Object *ob, int lay, float viewmat[][4
                                /* spot lamp */
                                negate_v3_v3(direction, base->object->obmat[2]);
                                glLightfv(GL_LIGHT0+count, GL_SPOT_DIRECTION, direction);
-                               glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, la->spotsize/2.0);
-                               glLightf(GL_LIGHT0+count, GL_SPOT_EXPONENT, 128.0*la->spotblend);
+                               glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, la->spotsize/2.0f);
+                               glLightf(GL_LIGHT0+count, GL_SPOT_EXPONENT, 128.0f*la->spotblend);
                        }
                        else
                                glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, 180.0);
index 0c6eef3ee246ccc52f978e680b9f4144e609aec7..6940b2a3543844acdccd139f2251d57958461c4c 100644 (file)
@@ -75,25 +75,25 @@ EnumPropertyItem constraint_type_items[] ={
        {CONSTRAINT_TYPE_SHRINKWRAP, "SHRINKWRAP", ICON_CONSTRAINT_DATA, "Shrinkwrap", ""},
        {0, NULL, 0, NULL, NULL}};
 
-EnumPropertyItem space_pchan_items[] = {
+static EnumPropertyItem space_pchan_items[] = {
        {0, "WORLD", 0, "World Space", ""},
        {2, "POSE", 0, "Pose Space", ""},
        {3, "LOCAL_WITH_PARENT", 0, "Local With Parent", ""},
        {1, "LOCAL", 0, "Local Space", ""},
        {0, NULL, 0, NULL, NULL}};
 
-EnumPropertyItem space_object_items[] = {
+static EnumPropertyItem space_object_items[] = {
        {0, "WORLD", 0, "World Space", ""},
        {1, "LOCAL", 0, "Local Space", ""},
        {0, NULL, 0, NULL, NULL}};
 
-EnumPropertyItem constraint_ik_type_items[] ={
+static EnumPropertyItem constraint_ik_type_items[] ={
        {CONSTRAINT_IK_COPYPOSE, "COPY_POSE", 0, "Copy Pose", ""},
        {CONSTRAINT_IK_DISTANCE, "DISTANCE", 0, "Distance", ""},
        {0, NULL, 0, NULL, NULL},
 };
 
-EnumPropertyItem constraint_ik_axisref_items[] ={
+static EnumPropertyItem constraint_ik_axisref_items[] ={
        {0, "BONE", 0, "Bone", ""},
        {CONSTRAINT_IK_TARGETAXIS, "TARGET", 0, "Target", ""},
        {0, NULL, 0, NULL, NULL},
index 12f15911bda829fc30d4db4d94b0fbf8fa9f4bcc..b3937b3322657d9f9f9f011f596b0ba5195e23a7 100644 (file)
@@ -2855,7 +2855,7 @@ void RNA_def_property_free_pointers(PropertyRNA *prop)
        }
 }
 
-void RNA_def_property_free(StructOrFunctionRNA *cont_, PropertyRNA *prop)
+static void rna_def_property_free(StructOrFunctionRNA *cont_, PropertyRNA *prop)
 {
        ContainerRNA *cont= cont_;
        
@@ -2880,7 +2880,7 @@ int RNA_def_property_free_identifier(StructOrFunctionRNA *cont_, const char *ide
        for(prop= cont->properties.first; prop; prop= prop->next) {
                if(strcmp(prop->identifier, identifier)==0) {
                        if(prop->flag & PROP_RUNTIME) {
-                               RNA_def_property_free(cont_, prop);
+                               rna_def_property_free(cont_, prop);
                                return 1;
                        }
                        else {
index c5d413b0c499596c58301c5a0b254b30151a1df5..228b00e79378693f01859078a56537d34df725bd 100644 (file)
@@ -272,8 +272,8 @@ static void rna_def_gpencil_layers(BlenderRNA *brna, PropertyRNA *cprop)
        StructRNA *srna;
        PropertyRNA *prop;
 
-       FunctionRNA *func;
-       PropertyRNA *parm;
+//     FunctionRNA *func;
+//     PropertyRNA *parm;
 
        RNA_def_property_srna(cprop, "GreasePencilLayers");
        srna= RNA_def_struct(brna, "GreasePencilLayers", NULL);
index 92311641d9873ad54e02699f4c3e6551c3eb7214..5a0708865b6918ae2da84be5eabe25217af65e54 100644 (file)
@@ -81,7 +81,7 @@ struct wmTimer *rna_event_timer_add(struct wmWindowManager *wm, float time_step,
 
 void rna_event_timer_remove(struct wmWindowManager *wm, wmTimer *timer)
 {
-       return WM_event_remove_timer(wm, timer->win, timer);
+       WM_event_remove_timer(wm, timer->win, timer);
 }
 
 #else
index 237a0f9b2162124634d8d8aa68b6443cfa55a5c1..36e804607cf48b529fa067e31e400e3f0154acdf 100644 (file)
@@ -191,14 +191,14 @@ static int edgecut_get(EdgeHash *edgehash, int v1, int v2)
 }
 
  
-const short add_faces[24] = {
+static const short add_faces[24] = {
        0,
        0, 0, 2, 0, 1, 2, 2, 0, 2, 1,
        2, 2, 2, 2, 3, 0, 0, 0, 1, 0,
        1, 1, 2
  };
 
-MFace *get_dface(DerivedMesh *dm, DerivedMesh *split, int cur, int i, MFace *mf)
+static MFace *get_dface(DerivedMesh *dm, DerivedMesh *split, int cur, int i, MFace *mf)
 {
        MFace *df = CDDM_get_face(split, cur);
        DM_copy_face_data(dm, split, i, cur, 1);
index c66935c1ab893a7d2c808b83a3912d85b2615908..d5980b786b03011bd66e1598ea5f3e6ba0716aed 100644 (file)
@@ -31,7 +31,8 @@
  */
 
 
-#include "../TEX_util.h"                                                   
+#include "../TEX_util.h"
+#include "TEX_node.h"
 
 static bNodeSocketType inputs[]= {
        { SOCK_RGBA,   1, "Texture",     0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f },
index fe9b7cfadb8d88991c76b5bd6f2b56cb94cad810..0eb982496a9f16849dfb2f0310707598179bd564 100644 (file)
@@ -31,7 +31,9 @@
  */
 
 
-#include "../TEX_util.h"                                                   
+#include "../TEX_util.h"
+#include "TEX_node.h"
+
 #include <math.h>
 
 static bNodeSocketType inputs[]= {
index 305d7094f57015cf596aebe6d1ee0cc5c98de91f..c6c25ba1a8aa787daac75d535d031bb3dacf7f25 100644 (file)
@@ -31,7 +31,8 @@
  */
 
 
-#include "../TEX_util.h"                                                   
+#include "../TEX_util.h"
+#include "TEX_node.h"
 #include <math.h>
 
 static bNodeSocketType inputs[]= {
index bde78e723991e2d7037359ac9825c8fdb4bb5a60..6eae78ec3de6feade88628f2c7330f2899e3367a 100644 (file)
@@ -31,7 +31,8 @@
  */
 
 
-#include "../TEX_util.h"                                                   
+#include "../TEX_util.h"      
+#include "TEX_node.h"
 
 static bNodeSocketType inputs[]= {
        { SOCK_VALUE, 1, "Red",   0.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f },
index c43aa9e4f32daaa24f8bd4e1e4c142abb57ee5a2..3c46971f0d466056baf24e1069b4f381775df1d5 100644 (file)
@@ -32,6 +32,7 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 static bNodeSocketType outputs[]= { 
        { SOCK_VECTOR, 0, "Coordinates", 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f },
index 0eb3927f9a83849d63485c312278b1823b22c23a..e388efd17c0d0e96e3567ab152bd04390f918f2f 100644 (file)
@@ -32,6 +32,7 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 /* **************** CURVE Time  ******************** */
 
index 1da9b6c681de765b2415f0a6654d7e1576b6ec9e..f27d8c987164cb980157684020d8283c58a3980a 100644 (file)
@@ -31,7 +31,8 @@
  */
 
 
-#include "../TEX_util.h"                                                   
+#include "../TEX_util.h"        
+#include "TEX_node.h"
 #include <math.h>
 
 static bNodeSocketType inputs[]= {
index 5f61a9e8045f0adb2143b1f6c097323281d157d1..b460844ba4ae755a5765b997463101a1e13cd8b3 100644 (file)
@@ -34,6 +34,7 @@
 #include <math.h>
 #include "BLI_math.h"
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 static bNodeSocketType inputs[]= {
        { SOCK_VECTOR, 1, "Coordinate 1", 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f },
index 70c5d25e1ebf941a8df9c1be9334c46139fcc8e6..471d8db2c03a918b443e7c5c1f4e17e73e289a76 100644 (file)
@@ -32,6 +32,7 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 
 static bNodeSocketType inputs[]= {
index 59144d60b6f0236e13df7c9c0af6c1529b580808..fcb18ab3342434a0a4cdea5eb9bc72c64cfc0a9a 100644 (file)
@@ -33,6 +33,7 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 static bNodeSocketType outputs[]= {
        { SOCK_RGBA, 0, "Image",  0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
index bfee670a8aeef5d24fe145af61d4a2a9fcb6d220..e908bdcff07ef5c3f01d862e29482b202997bb7d 100644 (file)
@@ -32,6 +32,7 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 /* **************** INVERT ******************** */ 
 static bNodeSocketType inputs[]= { 
index 1652ba10e482d06b0f47f741e5a00112690527ab..e00781741a0c7879716d8b837968c5d963b22252 100644 (file)
@@ -32,7 +32,7 @@
 
 
 #include "../TEX_util.h"
-
+#include "TEX_node.h"
 
 
 /* **************** SCALAR MATH ******************** */ 
index 44cec5d670d2005e55617d27c8b136b421279583..c7668c27b99ff1030a88c5249f1817c46b77805e 100644 (file)
@@ -32,6 +32,7 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 /* **************** MIX RGB ******************** */
 static bNodeSocketType inputs[]= {
index 30b5aee78324b714dd5f6b1aab13c6b320d2054f..046ad72450720024265bd51be9eaf6eb3c14c062 100644 (file)
@@ -32,6 +32,7 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 /* **************** COMPOSITE ******************** */
 static bNodeSocketType inputs[]= {
index 58de1fd19e5233396ca76287ce6c799893d15f94..294c1f7322f664a4f1820b4b23cbd909240103ba 100644 (file)
@@ -32,6 +32,8 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
+
 #include "RE_shader_ext.h"
 
 /* 
index 8f7793ddaaf50e45eb3dd3d16bb991ac12d2f7a4..1be6152a2b3910681f6b8726aa5af6945a3c1650 100644 (file)
@@ -34,6 +34,7 @@
 #include <math.h>
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 static bNodeSocketType inputs[]= { 
        { SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
index 7b8a52d19231356fc600a0ec3fcee2fc8b844eae..d4d77b5fd5afb201cc011e7a42b7e79c7df35d66 100644 (file)
@@ -32,6 +32,8 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
+
 #include "RE_shader_ext.h"
 
 static bNodeSocketType inputs[]= {
index a8fdae692445ed87d2488710f1615ad9214e30b7..8f7d6d837d74a1d330285eb2d0bb74ec52a7accd 100644 (file)
@@ -33,6 +33,7 @@
 
 #include <math.h>
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 static bNodeSocketType inputs[]= { 
        { SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
index 65b96f16adcc0346c24b6918aac4fbe44ddf2841..e430c0c9a95ec6f8b914e5cd6bc150944001c00a 100644 (file)
@@ -32,6 +32,7 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 static bNodeSocketType inputs[]= { 
        { SOCK_VALUE, 1, "Val",   0.0f,   0.0f, 0.0f, 1.0f,  0.0f,   1.0f },
index 867b6be083e9cdf2aa514c8ab7dfb8d11f4babb2..19fa6c67c096df8ccf4f9083fa36f74167bf6722 100644 (file)
@@ -33,6 +33,7 @@
 
 
 #include "../TEX_util.h"
+#include "TEX_node.h"
 
 /* **************** VALTORGB ******************** */
 static bNodeSocketType valtorgb_in[]= {
index 3deedf16f03cda8e5af4c8b4e82e701bc2013c9b..e917e525e17546d5b2159dacb39bd1cea940344c 100644 (file)
@@ -31,7 +31,8 @@
  */
 
 
-#include "../TEX_util.h"                                                   
+#include "../TEX_util.h"
+#include "TEX_node.h"
 #include <math.h>
 
 static bNodeSocketType inputs[]= {
index 8705efb055a862e209611f3a6bd3b26c3e3160e3..ba19f155842b6ed2736f711b4afb1d56733d714c 100644 (file)
@@ -64,6 +64,7 @@
 #endif
 /* --- end bpy build options --- */
 
+struct ID;
 
 extern PyTypeObject pyrna_struct_meta_idprop_Type;
 extern PyTypeObject pyrna_struct_Type;
@@ -192,4 +193,6 @@ void BPY_modules_update(struct bContext *C); //XXX temp solution
 extern PyMethodDef meth_bpy_register_class;
 extern PyMethodDef meth_bpy_unregister_class;
 
+void BPY_id_release(struct ID *id);
+
 #endif
index 284eac19fdd31b3638bffe812ee1cbea5f5274e7..b7f638b6441653f82f8754575ce25dffaf747cd1 100644 (file)
@@ -46,6 +46,7 @@
 
 #include "bpy_rna.h"
 #include "bpy_util.h"
+#include "bpy_rna_anim.h"
 
 #define TRUE 1
 #define FALSE 0