junkies will be happy to find the datatoc.c program in the
datafiles directory).
Some quick notes:
* 'datafiles' has the version 2.21 splash.jpg and blenderbuttons (e.g., so
no NLA icon). Someone should at least get the 2.25 blenderbuttons from
somewhere and commit them.
* 'text' has obsolete content/license
* I did not include the python scripts as they have copyright
Jan Walter and no license specified.
* I changed to unix line terminators everywhere with the exeption of the
'windows' directory.
Chris
and include both files.
Anyway I was fixing the warning with ascii char... Here is the diff for
editfont.c (the .h was just fixing the header to match it)
Kent
Index: editfont.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/editfont.c,v
retrieving revision 1.3
diff -u -r1.3 editfont.c
--- editfont.c 25 Nov 2002 12:02:05 -0000 1.3
+++ editfont.c 31 Dec 2002 11:52:10 -0000
@@ -226,11 +226,12 @@
}
}
-void do_textedit(unsigned short event, short val, char ascii)
+void do_textedit(unsigned short event, short val, unsigned char _ascii)
{
Curve *cu;
static int accentcode= 0;
int x, doit=0, cursmove=0;
+ int ascii = _ascii;
It was causing funky artifacts on some letters that dropped down into the
background.
Here is the diff
Kent
Index: toolbox.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/toolbox.c,v
retrieving revision 1.5
diff -u -r1.5 toolbox.c
--- toolbox.c 22 Dec 2002 13:43:21 -0000 1.5
+++ toolbox.c 30 Dec 2002 20:13:51 -0000
@@ -506,7 +506,7 @@
oldcursor= get_cursor();
set_cursor(CURSOR_STD);
- tbfontyofs= (TBOXH-11)/2; /* toolbox, hier stond ooit getheigh */
+ tbfontyofs= (TBOXH-11)/2 +2; /* toolbox, hier stond ooit getheigh */
}
---------------------------->8----------------------------------------------
g++ -DHAVE_CONFIG_H -I. -I../../../blender/intern/bsp -I../.. -I../../../blender/intern/container -I../../../blender/intern/moto/include -I../../../blender/intern/memutil -I/usr/freeware/include -g -funsigned-char -c ../../../blender/intern/bsp/intern/BSP_CSGMesh.cpp -MT BSP_CSGMesh.lo -MD -MP -MF .deps/BSP_CSGMesh.TPlo -DPIC -o .libs/BSP_CSGMesh.lo
/usr/freeware/lib/gcc-lib/mips-sgi-irix6.5/3.0.4/include/g++/bits/stl_iterator.h: In
constructor `std::__normal_iterator<_Iterator,
_Container>::__normal_iterator(const std::__normal_iterator<_Iter,
_Container>&) [with _Iter = const BSP_MFace*, _Iterator = BSP_MFace*,
_Container = std::vector<BSP_MFace, std::allocator<BSP_MFace> >]':
../../../blender/intern/bsp/intern/BSP_CSGMesh.cpp:270: instantiated from here
/usr/freeware/lib/gcc-lib/mips-sgi-irix6.5/3.0.4/include/g++/bits/stl_iterator.h:474: cannot
convert `const BSP_MFace* const' to `BSP_MFace*' in initialization
*** Error code 1 (bu21)
*** Error code 1 (bu21)
*** Error code 1 (bu21)
*** Error code 1 (bu21)
---------------------------->8----------------------------------------------
The line in question that causes the error is the middle one in this group:
vector<BSP_MFace>::const_iterator f_it_end = FaceSet().end();
vector<BSP_MFace>::const_iterator f_it_begin = FaceSet().begin();
vector<BSP_MFace>::iterator f_it = FaceSet().begin();
Dropping the 'const_' from that middle line enables gcc to compile the
file correctly (this is also consistent with what is going on with other
parts of the file, i.e., stuff that is returned from a begin() method is
declared as vector<BSP_MFace>::iterator instead of
vector<BSP_MFace>::const_iterator.
But I'll be honest: I have no idea what this code does, so if somebody with
better C++ skills wants to check it, then please do.
This change was also tested to compile and run on debian linux/x86
(well, booleans are broken right now, so I wasn't able to do too much
testing).
Chris
I took out the following from the includes in the intern dir that still had
it:
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
Kent
--
mein@cs.umn.edu
too -- a user reported crashing while using decimation and rolling back
the modifications between rev 1.2 and rev 1.3 for this file fixed it.
Regards,
Chris
(to stop gcc compiler warnings) caused segfaults when
performing intersections (and possibly while doing other
boolean operations). I felt it was best to revert these
changes (I also got rid of the DOS line terminators in
the files). Some more info about the matter can be found
in the first 10 or so posts for Novembor on the old
mailing list:
http://www.soze.com/mailman/private/bf-committers/2002-November/date.html
Chris (Merry Christmas!)
comes with OSX in /usr/local.
Removed some frozen python files that were not generated by the freeze script.
mxTextTools is still disabled because of a link error.
Maarten
same thing:
Added the xpcom include and added a flag to use mozilla vs netscape.
Which basically adds some ifdefs to
_Blender3DPlugin_implementation_.cpp
Basically I modified the nan_definitions.mk in the following way
(You'll need to update yours don't forget) ;)
Also updated the makefiles to use the new vars and flushed them out
so they first include whatever nspr is set to and then look in
NAN_MOZILLA_INC
I wasn't sure what the NAN_MOZILLA_INC and _LIB defaults should be
since were assuming they point to a netscape dir by default (or maybe
old mozilla???)
maybe they should be
export NAN_MOZILLA_INC ?= $(LCGDIR)/netscape/include
export NAN_MOZILLA_LIB ?= $(LCGDIR)/netscape/lib/
instead...
Anyone have any opinions on the defaults?
Kent
--
mein@cs.umn.edu
Index: nan_definitions.mk
===================================================================
RCS file: /cvs01/blender/source/nan_definitions.mk,v
retrieving revision 1.8
diff -u -r1.8 nan_definitions.mk
--- nan_definitions.mk 2002/12/19 21:12:58 1.8
+++ nan_definitions.mk 2002/12/20 19:28:51
@@ -75,7 +75,13 @@
export NAN_TEST_VERBOSITY ?= 1
export NAN_ZLIB ?= $(LCGDIR)/zlib
export NAN_BMFONT ?= $(LCGDIR)/bmfont
- export NAN_MOZILLA ?= $(LCGDIR)/mozilla
+ # Uncomment the following line to use Mozilla inplace of netscape
+ # CPPFLAGS +=-DMOZ_NOT_NET
+ # Location of MOZILLA/Netscape header files...
+ export NAN_MOZILLA_INC ?= $(LCGDIR)/mozilla/include
+ export NAN_MOZILLA_LIB ?= $(LCGDIR)/mozilla/lib/
+ # Will fall back to look in NAN_MOZILLA_INC/nspr and NAN_MOZILLA_LIB
+ # if this is not set.
export NAN_NSPR ?= $(LCGDIR)/nspr
comment inside of a comment
Also removed the config.h thing since this is a .h
Hopefully I'll get around to the other .h's soon.
Kent
--
mein@cs.umn.edu
Time to go watch er.
Note this was already done with face_old, img_old was probably just
overlooked.
(If you guys didn't notice I was sick for a couple of days but I'm back now
as you can tell)
Kent
--
mein@cs.umn.edu
Index: editface.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/editface.c,v
retrieving revision 1.3
diff -u -r1.3 editface.c
--- editface.c 2002/11/25 12:02:05 1.3
+++ editface.c 2002/12/20 02:50:55
@@ -1202,7 +1202,7 @@
TFace *face, *face_old = 0;
short xy[2], xy_old[2];
//int a, index;
- Image *img, *img_old;
+ Image *img, *img_old = 0;
in readfile.c I renamed some localvars that were named main to mainl in
a couple of functions.
in action.c I initalized a var to 0. This is probably not needed but
its a little safer incase someone adds more modes...
I've included a diff of this last one below.
Kent
Index: action.c
===================================================================
RCS file: /cvs01/blender/source/blender/blenkernel/intern/action.c,v
retrieving revision 1.6
diff -u -r1.6 action.c
--- action.c 2002/11/25 12:01:52 1.6
+++ action.c 2002/12/20 02:06:27
@@ -153,7 +153,7 @@
){
bConstraint *dcon;
const bConstraint *scon;
- float dstweight;
+ float dstweight = 0;
switch (mode){
case POSE_BLEND:
