moved more minor changes across from trunk, fixed some incorrect merges and removed...
authorCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2011 06:53:39 +0000 (06:53 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2011 06:53:39 +0000 (06:53 +0000)
22 files changed:
source/blender/blenkernel/intern/BME_tools.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/fluidsim.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/lattice.c
source/blender/blenkernel/intern/modifiers_bmesh.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/sca.c
source/blender/blenkernel/intern/seqcache.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenkernel/intern/sound.c
source/blender/blenlib/intern/pbvh.c
source/blender/blenlib/intern/rct.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/view3d_edit.c

index 744276d..1543532 100644 (file)
@@ -45,7 +45,6 @@
 #include "DNA_object_types.h"
 
 #include "BLI_math.h"
-#include "BLI_cellalloc.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_bmesh.h"
index ec74391..f64d49f 100644 (file)
@@ -52,8 +52,6 @@
 #include "DNA_key_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_windowmanager_types.h"
-#include "DNA_view3d_types.h"
 #include "DNA_vfont_types.h"
 
 #include "BKE_animsys.h"
index 3f361fe..fd25ebe 100644 (file)
@@ -41,7 +41,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_cellalloc.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
index 29b3bd5..5b79f07 100644 (file)
@@ -456,8 +456,6 @@ static int read_undosave(bContext *C, UndoElem *uel)
 
        BLI_strncpy(mainstr, G.main->name, sizeof(mainstr));    /* temporal store */
 
-       strcpy(mainstr, G.main->name);  /* temporal store */
-
        fileflags= G.fileflags;
        G.fileflags |= G_FILE_NO_UI;
 
index b93362b..3f1c897 100644 (file)
@@ -44,7 +44,6 @@
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_editVert.h"
-#include "BLI_cellalloc.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_armature_types.h"
index fb15f0b..b25c4a2 100644 (file)
@@ -67,6 +67,7 @@
 
 /* ************************* fluidsim bobj file handling **************************** */
 
+
 //-------------------------------------------------------------------------------
 // file handling
 //-------------------------------------------------------------------------------
index 1931946..6898615 100644 (file)
@@ -258,7 +258,7 @@ static PackedFile *get_builtin_packedfile(void)
 void free_ttfont(void)
 {
        struct TmpFont *tf;
-       
+
        for(tf= ttfdata.first; tf; tf= tf->next) {
                if(tf->pf) freePackedFile(tf->pf); /* NULL when the font file can't be found on disk */
                tf->pf= NULL;
index 8c8a693..641eb0b 100755 (executable)
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: idcode.c 35493 2011-03-12 14:38:00Z campbellbarton $
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index 06145f0..a345ced 100644 (file)
@@ -67,7 +67,6 @@
 
 
 #include "RNA_access.h"
-#include "BLI_cellalloc.h"
 
 #define KEY_MODE_DUMMY         0 /* use where mode isn't checked for */
 #define KEY_MODE_BPOINT                1
index fece1b8..f0ac704 100644 (file)
@@ -45,7 +45,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_cellalloc.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
index b415b09..7b6e843 100644 (file)
@@ -46,7 +46,6 @@
 #include "BLI_edgehash.h"
 #include "BLI_ghash.h"
 #include "BLI_memarena.h"
-#include "BLI_cellalloc.h"
 
 #include "MEM_guardedalloc.h"
 
index ae90d3d..ba2434b 100644 (file)
@@ -3654,4 +3654,5 @@ void clear_scene_in_nodes(Main *bmain, Scene *sce)
                        }
                }
        }
-}
\ No newline at end of file
+}
+
index 4ee7ee5..16cef67 100644 (file)
@@ -594,15 +594,6 @@ void set_sca_new_poins_ob(Object *ob)
                                bPropertyActuator *pa= act->data;
                                ID_NEW(pa->ob);
                        }
-                       else if(act->type==ACT_ARMATURE) {
-                               bArmatureActuator *aa = act->data;
-                               ID_NEW(aa->target);
-                               ID_NEW(aa->subtarget);
-                       }
-                       else if(act->type==ACT_PROPERTY) {
-                               bPropertyActuator *pa= act->data;
-                               ID_NEW(pa->ob);
-                       }
                }
                act= act->next;
        }
index 6f32943..5ac6bb4 100755 (executable)
@@ -1,5 +1,5 @@
 /*
-* $Id$
+* $Id: seqcache.c 36197 2011-04-17 10:05:27Z schlaile $
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index 23c0d87..ce45407 100644 (file)
@@ -71,7 +71,6 @@ variables on the UI for now
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_threads.h"
-#include "BLI_cellalloc.h"
 
 #include "BKE_curve.h"
 #include "BKE_effect.h"
index 1756227..e0e456a 100644 (file)
@@ -454,8 +454,8 @@ void sound_seek_scene(struct bContext *C)
                AUD_resume(scene->sound_scene_handle);
                if(AUD_getStatus(scene->sound_scrub_handle) != AUD_STATUS_INVALID)
                        AUD_seek(scene->sound_scrub_handle, 0);
-               //XXX merge EEK! else
-                       //scene->sound_scrub_handle = AUD_pauseAfter(scene->sound_scene_handle, 1 / FPS);
+               else
+                       scene->sound_scrub_handle = AUD_pauseAfter(scene->sound_scene_handle, 1 / FPS);
        }
        else
        {
index 5372adb..e9a0ddd 100644 (file)
@@ -1405,8 +1405,7 @@ int BLI_pbvh_node_raycast(PBVH *bvh, PBVHNode *node, float (*origco)[3],
        return hit;
 }
 
-//#include "BIF_gl.h"
-//#include "BIF_glutil.h"
+//#include <GL/glew.h>
 
 void BLI_pbvh_node_draw(PBVHNode *node, void *UNUSED(data))
 {
index c520375..cf65539 100644 (file)
@@ -43,8 +43,6 @@
 #include <math.h>
 
 #include "DNA_vec_types.h"
-#include <stdio.h>
-#include <math.h>
 #include "BLI_rect.h"
 
 int BLI_rcti_is_empty(rcti * rect)
index 7807bb0..4f77ecf 100644 (file)
@@ -46,7 +46,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
-#include "BLI_cellalloc.h"
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
index cb89b92..015d8d1 100644 (file)
@@ -40,7 +40,6 @@
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
-#include "BKE_tessmesh.h"
 
 #include "bmesh.h"
 
index 115e7a2..0e574ca 100644 (file)
@@ -5757,7 +5757,7 @@ void draw_outliner(const bContext *C)
        outliner_back(ar);
        block= uiBeginBlock(C, ar, "outliner buttons", UI_EMBOSS);
        outliner_draw_tree((bContext *)C, block, scene, ar, soops);
-
+       
        if(ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
                /* draw rna buttons */
                outliner_draw_rnacols(ar, sizex_rna);
@@ -5775,9 +5775,6 @@ void draw_outliner(const bContext *C)
        /* draw edit buttons if nessecery */
        outliner_buttons(C, block, ar, soops, &soops->tree);    
 
-       /* draw edit buttons if nessecery */
-       outliner_buttons(C, block, ar, soops, &soops->tree);    
-
        uiEndBlock(C, block);
        uiDrawBlock(C, block);
        
index 051a972..2509ae7 100644 (file)
@@ -55,7 +55,6 @@
 #include "BKE_paint.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
-#include "BKE_tessmesh.h"
 
 
 #include "BIF_gl.h"
@@ -1686,7 +1685,7 @@ static int viewselected_exec(bContext *C, wmOperator *UNUSED(op)) /* like a loca
        INIT_MINMAX(min, max);
 
        if (ob && ob->mode & OB_MODE_WEIGHT_PAINT) {
-               /* hardcoded exception, we look for the one selectedW armature */
+               /* hardcoded exception, we look for the one selected armature */
                /* this is weak code this way, we should make a generic active/selection callback interface once... */
                Base *base;
                for(base=scene->base.first; base; base= base->next) {
@@ -2182,18 +2181,18 @@ static void axis_set_view(bContext *C, View3D *v3d, ARegion *ar, float q1, float
 
        if(align_active==FALSE) {
                /* normal operation */
-       if(rv3d->viewlock) {
-               /* only pass on if */
+               if(rv3d->viewlock) {
+                       /* only pass on if */
                        if(rv3d->view==RV3D_VIEW_FRONT && view==RV3D_VIEW_BACK);
                        else if(rv3d->view==RV3D_VIEW_BACK && view==RV3D_VIEW_FRONT);
                        else if(rv3d->view==RV3D_VIEW_RIGHT && view==RV3D_VIEW_LEFT);
                        else if(rv3d->view==RV3D_VIEW_LEFT && view==RV3D_VIEW_RIGHT);
                        else if(rv3d->view==RV3D_VIEW_BOTTOM && view==RV3D_VIEW_TOP);
                        else if(rv3d->view==RV3D_VIEW_TOP && view==RV3D_VIEW_BOTTOM);
-               else return;
-       }
+                       else return;
+               }
 
-       rv3d->view= view;
+               rv3d->view= view;
        }
 
        if(rv3d->viewlock) {