griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
24,674 Commits 1 Branch 0 Tags
05eb72ff141ad74b57504b7cf28b81548162d650
Commit Graph

55 Commits

Author SHA1 Message Date
Thomas Dinges
5b9059e2bd Compile fix for changes in "filldisplist" function. 2010-06-23 17:40:17 +00:00
Arystanbek Dyussenov
8e1a63dbc9 Merge -c 29322 from COLLADA branch into trunk. 2010-06-07 20:37:56 +00:00
Arystanbek Dyussenov
eb50486df2 Fix COLLADA build error. This was caused by the difference in OpenCollada versions between Windows and Linux/Mac. Windows uses OpenCollada revision 746, Linux/Mac - 721. 2010-06-07 20:07:31 +00:00
Arystanbek Dyussenov
05188c26ce Merge -c 29280 from COLLADA branch into trunk. 2010-06-06 19:32:12 +00:00
Nathan Letwory
a6d5f43ac8 * update CMake and SCons for the OpenCollada update (to r746). 
- DocumentExporter changed due to function name change in API
  - no more UTF lib
  - enabled by default for win32

Note: debug libs will be added later, as well as 64bit windows libs.

For other platforms, get r746 of OpenCollada and build against that.
 2010-06-06 00:33:59 +00:00
Arystanbek Dyussenov
a545998c84 Merge -c 29009,29081,29189 from COLLADA branch into trunk. 2010-06-03 17:41:33 +00:00
Stefan Gartner
03f983da85 Makefiles: fixed opencollada include path 2010-05-14 08:16:45 +00:00
Campbell Barton
93f420b666 correct typo's 2010-04-25 15:24:18 +00:00
Arystanbek Dyussenov
d15c7a2eae Merge -c 28147 from COLLADA branch into trunk. 2010-04-12 15:32:59 +00:00
Arystanbek Dyussenov
1c031d968b Merge -c 28089 from COLLADA branch into trunk. 2010-04-08 11:57:23 +00:00
Matt Ebb
ea7fdb55a3 Compile fix to collada after ED_object_apply_obmat() was removed. 
Arystanbek, please feel free to fix if it's not ok :)
 2010-04-06 02:05:02 +00:00
Arystanbek Dyussenov
35c0e5052a Merge -c 28014 from COLLADA branch into trunk. 2010-04-05 15:47:57 +00:00
Arystanbek Dyussenov
f87f5d67ed Merge -c 27903 from COLLADA branch into trunk. 2010-03-31 15:04:46 +00:00
Arystanbek Dyussenov
80f2eb9d2b Merge -c 27876 from COLLADA branch into trunk. 2010-03-30 18:21:47 +00:00
Arystanbek Dyussenov
8da10f59eb Merge -c 27223 from COLLADA branch into trunk. Vertex color export was requested and reported to work by Blake Maltby. 2010-03-11 15:37:19 +00:00
Campbell Barton
1708ac0723 rename some functions to use easier to understand names. 
'BLI_makestringcode' --> 'BLI_path_rel'
'BLI_convertstringcwd' --> 'BLI_path_cwd'
'BLI_convertstringframe' --> 'BLI_path_frame'
'BLI_convertstringframe_range' --> 'BLI_path_frame_range'
'BLI_make_cwdpath' --> 'BLI_path_cwd'
 2010-03-09 17:36:23 +00:00
Campbell Barton
b356eb6a8b image re-project now uses offscreen render function and has input for render size. 
unrelated changes that ended up being more trouble to commit separate...

- removed BLI_split_dirfile(), was nasty, occasionaly modifying the source string, it could create directories and used the $CWD in some cases. was only used in 2 places in filesel.c, if this gives problems can address without bringing back this function.
  renamed BLI_split_dirfile_basic --> BLI_split_dirfile

- view3d_operator_needs_opengl was being called for offscreen render when it wasnt needed.
 2010-03-08 20:08:04 +00:00
Campbell Barton
878d8b44ee remove rna functions image.get_export_path() and image.get_abs_filename(), filename functions should not be spesific to images. 
rename BKE_get_image_export_path() to BKE_rebase_path() and take a filename arg rather then an image.

obj export file copy was also not working because of a missing import.
 2010-02-26 11:50:59 +00:00
Campbell Barton
3bf2715039 apply visual transform to pose 
So constrainted bones can have their transform applied to their loc/scale/rot, then remove the constraints
 2010-02-19 15:34:26 +00:00
Arystanbek Dyussenov
b3d41ac144 Merge -c 26897,26932 from COLLADA branch into trunk. 2010-02-15 16:18:21 +00:00
Arystanbek Dyussenov
b43f107195 Merge -c 26848 from COLLADA branch into trunk. 2010-02-12 20:32:36 +00:00
Campbell Barton
081c1205a3 correct fsf address 2010-02-12 13:34:04 +00:00
Arystanbek Dyussenov
4746fbd8ce COLLADA exporter (in trunk): write 1 normal per flat face instead of 3 or 4. 2010-02-11 14:53:29 +00:00
Arystanbek Dyussenov
ebf491b111 Merge -c 26630 from COLLADA branch into trunk. 2010-02-05 18:39:04 +00:00
Arystanbek Dyussenov
1f863d0122 COLLADA branch: merge from trunk -r 25745:26429. 
scons+vc build crashes on Blender start when BF_COLLADA is on, don't know why this happens.

Merging from trunk to get working vc project files, then will try to debug and locate the problem.
 2010-01-30 14:12:51 +00:00
Campbell Barton
e307f6c6a0 rename defgroup functions to be more consistant. 
* no functional changes *
 2010-01-26 13:50:17 +00:00
Arystanbek Dyussenov
6695334377 COLLADA branch: patch for importer from Sergey I. Sharybin to build against OpenCollada at revision 721. Thanks Sergey! 
People who want to build this branch will need update their OpenCollada.

On Linux OpenCollada builds without patching. As usual I updated the build doc: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch#Building_the_COLLADA_GSoC_branch

A small change will be necessary in cmake and scons options on Mac and Windows: OpenCollada's libBuffer was renamed to libbuffer.
 2010-01-23 17:33:40 +00:00
Arystanbek Dyussenov
ea1b97a184 COLLADA branch: partial fix of bug #20634 
* scale and rotation of objects with negative scale is exported correctly. This is accomplished by:
** if ob has no parent, use ob->rot, ob->scale values directly
** if ob has a parent, a local matrix is computed without scale and rotation is derived from it, scale value is copied directly from ob->size

Noted a few other bugs:
* importer suffers from negative scale problem too
* bones with negative scale are exported incorrectly too
* object animation values are copied from FCurves which is not ok for child objects where values should be in parent-space
 2010-01-23 12:45:54 +00:00
Arystanbek Dyussenov
574049782a Merge -c 25963 from COLLADA branch into trunk. 2010-01-13 12:51:07 +00:00
Arystanbek Dyussenov
799fd6f373 COLLADA branch: fix #20653 - <animation> tag's target attribute was missing ".ANGLE". 
Also replaced "."s in <animation> ids with "_" and corrected bone <node> sids.
 2010-01-13 12:44:57 +00:00
Guillermo S. Romero
34794eafe4 SVN maintenance. 2010-01-10 21:58:40 +00:00
Stefan Gartner
9da2c0c6c2 add OpenCOLLADA support to Makefiles 
add "export WITH_OPENCOLLADA=true" to user-def.mk to enable it
 2010-01-10 09:11:48 +00:00
Arystanbek Dyussenov
1bca8389dd Merge from trunk -r 25003:25745. 2010-01-05 19:21:59 +00:00
Arystanbek Dyussenov
0a0d43a926 Merge -c 25001,25310,25311,25638,25746 from COLLADA branch into trunk. 2010-01-05 17:42:01 +00:00
Arystanbek Dyussenov
06d548bd6f COLLADA branch: bone anim export works. Export-import roundtrip is possible. 
Importer now takes mesh bind position into account.

TODO: read/write object-level anim on armatures and fix memleaks.
 2010-01-05 16:07:10 +00:00
Arystanbek Dyussenov
18eb6d9827 COLLADA branch: fixed a small bug in bone anim import code. 2009-12-31 14:31:42 +00:00
Andrea Weikert
ca16488e81 MSVC 9 compile fixes and cleanups 
* added renamed files in revision 25337
* renamed BLI_util.h -> BLI_path_util.h for consistency
* cleanup of #includes: removed BLI_blenlib.h in favour of direct includes of the needed headerfiles in a few places.
* removed debug print in sequencer.c
* added missing include in blenkernel/blender.c -> bad dependency, needs to be fixed still
 2009-12-13 17:46:30 +00:00
Arystanbek Dyussenov
4654afb34c COLLADA branch: patch from Jan Diederich for bump-map export via <extra> tag. 2009-12-11 13:54:56 +00:00
Arystanbek Dyussenov
1105917892 COLLADA branch: small code clean-ups in bone anim export. Correct bone anim export is to be done yet. 2009-12-11 13:06:18 +00:00
Arystanbek Dyussenov
92b4316708 Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail. 2009-11-29 19:16:52 +00:00
Arystanbek Dyussenov
71a2cc3222 Merge from trunk -r 24758:25003. 2009-11-29 18:54:37 +00:00
Arystanbek Dyussenov
ead79e535d COLLADA branch: bone animation import works! 
Here's the doc describing how it works: http://wiki.blender.org/index.php/User:Kazanbas/Collada_Animation_Import

Here's a video showing it at work: http://vimeo.com/7877617
 2009-11-29 14:38:50 +00:00
Campbell Barton
b40307df16 add access to bone add/remove from rna. eg. 
bone = arm.edit_bones.new("SomeBone")
 arm.edit_bones.remove(bone)

regify (WIP)
 2009-11-25 11:05:11 +00:00
Brecht Van Lommel
284f66acf7 Fix for last commit, forgot to update collada. 2009-11-24 12:35:06 +00:00
Campbell Barton
67c295da9c rename pose_channels to bones 
was: object.pose.pose_channels["Bone"]
now: object.pose.bones["Bone"]
 2009-11-18 11:40:55 +00:00
Arystanbek Dyussenov
6df83fba02 Merge -c 24547 from COLLADA branch (fix flipping of triangles created by tesselation). 2009-11-13 15:48:45 +00:00
Arystanbek Dyussenov
fdcc0ff7c7 Merge -c 24531 from COLLADA branch (fix holes in imported meshes). 2009-11-12 17:08:32 +00:00
Arystanbek Dyussenov
0adfc00e40 Merged -c 24514 from COLLADA branch (build edges on mesh import). 2009-11-12 03:41:41 +00:00
Erwin Coumans
9256408612 Fix CMake build system for Windows 
Add support for OPTION WITH_OPENCOLLADA for Windows
 2009-11-11 00:02:49 +00:00
Brecht Van Lommel
37e4a311b0 Math Lib 
* Convert all code to use new functions.
* Branch maintainers may want to skip this commit, and run this
  conversion script instead, if they use a lot of math functions
  in new code:
  http://www.pasteall.org/9052/python
 2009-11-10 20:43:45 +00:00