Revision: 18637
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18637
Author: blendix
Date: 2009-01-23 21:36:47 +0100 (Fri, 23 Jan 2009)
Log Message:
-----------
2.5: multiple small fixes
- wm draw method is now initialized correct when reading older
files, but the SDNA bug causing the problem is still unsolved.
is due to // char pad[8]; not being recognized as commented.
- triple buffer proxy texture test follows spec better now,
was disabling triple buffer unnecessarily on some drivers.
- some cmake compile fixes related to sequencer pthread usage
and removed bad level calls lib for player.
- show outliner header buttons in oops mode as well until that
can be switched in the UI.
- fix region data free issue for tooltips
- warning fixes
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
branches/blender2.5/blender/source/blender/blenlib/intern/arithb.c
branches/blender2.5/blender/source/blender/blenlib/intern/graph.c
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/blender2.5/blender/source/blender/gpu/GPU_draw.h
branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_draw.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
2009-01-23 20:36:47 UTC (rev 18637)
@@ -39,6 +39,7 @@
struct MDeformVert;
struct Mesh;
struct MFace;
+struct MEdge;
struct MVert;
struct MCol;
struct Object;
Modified: branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
2009-01-23 20:36:47 UTC (rev 18637)
@@ -56,18 +56,12 @@
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
-IF(WITH_PLAYER)
- SUBDIRS(bad_level_call_stubs)
-ENDIF(WITH_PLAYER)
-
IF(WITH_PYTHON)
SET(INC ${INC} ../python ${PYTHON_INC})
ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON)
-BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
-
IF(WITH_INTERNATIONAL)
ADD_DEFINITIONS(-DWITH_FREETYPE2)
ENDIF(WITH_INTERNATIONAL)
@@ -75,3 +69,10 @@
IF(NOT WITH_ELBEEM)
ADD_DEFINITIONS(-DDISABLE_ELBEEM)
ENDIF(NOT WITH_ELBEEM)
+
+IF(WIN32)
+ SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
+BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
+
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -2387,7 +2387,7 @@
static void write_videoscape_mesh(Scene *scene, Object *ob, char *str)
{
- Mesh *me;
+ Mesh *me= ob->data;
EditMesh *em = me->edit_mesh;
Material *ma;
MFace *mface;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -215,7 +215,7 @@
/*first check if the array buffer size has room*/
/*if newlen is 200 chars less then totallen, reallocate anyway*/
if (newlen <= prop->totallen && prop->totallen - newlen < 200) {
- idp_resize_group_array(prop, newlen, newarr);
+ idp_resize_group_array(prop, newlen, prop->data.pointer);
prop->len = newlen;
return;
}
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -428,7 +428,7 @@
void multiresModifier_subdivide(MultiresModifierData *mmd, Object *ob, int
distance, int updateblock, int simple)
{
DerivedMesh *final = NULL;
- int totsubvert, totsubface, totsubedge;
+ int totsubvert = 0, totsubface = 0, totsubedge = 0;
Mesh *me = get_mesh(ob);
MDisps *mdisps;
int i;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -223,6 +223,9 @@
if(art && art->free)
art->free(ar);
}
+ else if(ar->type && ar->type->free)
+ ar->type->free(ar);
+
if(ar) {
if(ar->regiondata)
printf("regiondata free error\n");
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/arithb.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/arithb.c
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/arithb.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -34,6 +34,7 @@
/* ************************ FUNKTIES **************************** */
+#include <stdlib.h>
#include <math.h>
#include <sys/types.h>
#include <string.h>
@@ -62,15 +63,15 @@
#define SWAP(type, a, b) { type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
#define CLAMP(a, b, c) if((a)<(b)) (a)=(b); else if((a)>(c)) (a)=(c)
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
-#if defined(WIN32) || defined(__APPLE__)
-#include <stdlib.h>
-#define M_PI 3.14159265358979323846
+#ifndef M_SQRT2
#define M_SQRT2 1.41421356237309504880
+#endif
-#endif /* defined(WIN32) || defined(__APPLE__) */
-
float saacos(float fac)
{
if(fac<= -1.0f) return (float)M_PI;
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/graph.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/graph.c
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/graph.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -279,7 +279,7 @@
BNode * BLI_FindNodeByPosition(BGraph *graph, float *p, float limit)
{
BNode *closest_node = NULL, *node;
- float min_distance;
+ float min_distance = 0.0f;
for(node = graph->nodes.first; node; node = node->next)
{
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
2009-01-23 17:42:36 UTC (rev 18636)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -238,7 +238,6 @@
void ui_remove_temporary_region(bContext *C, bScreen *sc, ARegion *ar)
{
- ar->regiondata= NULL;
wm_draw_region_clear(CTX_wm_window(C), ar);
ED_region_exit(C, ar);
BKE_area_region_free(NULL, ar); /* NULL: no spacetype */
Modified:
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
2009-01-23 17:42:36 UTC (rev 18636)
+++
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -199,7 +199,7 @@
uiBlockSetEmboss(block, UI_EMBOSS);
}
- if(soutliner->type==SO_OUTLINER) {
+ if(1) { // XXX soutliner->type==SO_OUTLINER) {
if(G.main->library.first)
uiDefButS(block, MENU, B_REDR, "Outliner
Display%t|Libraries %x7|All Scenes %x0|Current Scene %x1|Visible Layers
%x2|Groups %x6|Same Types %x5|Selected %x3|Active %x4|Sequence %x10|Datablocks
%x11|User Preferences %x12", xco, yco, 120, 20, &soutliner->outlinevis, 0,
0, 0, 0, "");
else
Modified: branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -1499,7 +1499,7 @@
EditFace *efa;
MTFace *tf;
NearestHit hit;
- int a, i, select, selectmode, sticky, sync, hitv[4], nvert;
+ int a, i, select = 1, selectmode, sticky, sync, hitv[4], nvert;
int flush = 0; /* 0 == dont flush, 1 == sel, -1 == desel; only use
when selection sync is enabled */
float limit[2], *hituv[4], penalty[2];
Modified: branches/blender2.5/blender/source/blender/gpu/GPU_draw.h
===================================================================
--- branches/blender2.5/blender/source/blender/gpu/GPU_draw.h 2009-01-23
17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/gpu/GPU_draw.h 2009-01-23
20:36:47 UTC (rev 18637)
@@ -42,6 +42,7 @@
struct Object;
struct Scene;
struct View3D;
+struct RegionView3D;
/* OpenGL drawing functions related to shading. These are also
* shared with the game engine, where there were previously
Modified:
branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
2009-01-23 20:36:47 UTC (rev 18637)
@@ -195,7 +195,8 @@
short tb_leftmouse, tb_rightmouse;
struct SolidLight light[3];
short tw_hotspot, tw_flag, tw_handlesize, tw_size;
- int textimeout, texcollectrate;
+ short textimeout,texcollectrate;
+ short wmdrawmethod, wmpad;
int memcachelimit;
int prefetchframes;
short frameserverport;
@@ -216,8 +217,6 @@
short autokey_mode; /* autokeying mode */
short autokey_flag; /* flags for autokeying */
- int wmdrawmethod, pad;
-
struct ColorBand coba_weight; /* from texture.h */
} UserDef;
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -794,11 +794,11 @@
{2, "SCALE", "Scale", ""},
{0, NULL, NULL, NULL}};
- static EnumPropertyItem axis_map_items[] = {
+ /*static EnumPropertyItem axis_map_items[] = {
{0, "X", "X", ""},
{1, "Y", "Y", ""},
{2, "Z", "Z", ""},
- {0, NULL, NULL, NULL}};
+ {0, NULL, NULL, NULL}};*/
srna= RNA_def_struct(brna, "TransformConstraint", "Constraint");
RNA_def_struct_ui_text(srna, "Transformation Constraint", "Maps
transformations of the target to the object.");
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
