griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
35,188 Commits 1 Branch 0 Tags
444833a8fbecde23ccc6a1a78be7a97f052d2cfd
Commit Graph

312 Commits

Author SHA1 Message Date
Campbell Barton
db6cb30941 svn merge ^/trunk/blender -r42669:42670 2011-12-16 23:50:55 +00:00
Brecht Van Lommel
3311164b24 Math lib: matrix multiplication order fix for two functions that were 
inconsistent with similar functions & math notation:

mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B)
mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B)

For branch maintainers, it should be relatively simple to fix things manually,
it's also possible run this script after merging to do automatic replacement:
http://www.pasteall.org/27459/python
 2011-12-16 19:53:12 +00:00
Andrew Wiggin
bc9b593909 More DM func renames, fixing some build breaks, renaming more stuff, also seems like it might be fixing the recent CDDM_copy corruption/leak bug 2011-11-30 18:03:56 +00:00
Campbell Barton
f28fd56f8f svn merge ^/trunk/blender -r42095:42116 2011-11-24 05:33:22 +00:00
Brecht Van Lommel
2345efc6c5 Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface, 
by Gaia Clary.

Rationale: the name was confusing and not always used consistently, and this
map itself is not something that can be layered, rather the map can be used
as texture coordinates in some layered setup.

The original intent was to indicate this contained more than just UV's, but
the game engine settings have already been moved out, and apparently users
didn't really get this from the name anyway.
 2011-11-23 17:25:25 +00:00
Campbell Barton
e59ab6486f svn merge -r41751:41779 ^/trunk/blender 2011-11-15 02:05:32 +00:00
Campbell Barton
e84c0980a3 correct indentation and some whitespace edits (no functional changes) 2011-11-11 13:09:14 +00:00
Campbell Barton
7508540c53 svn merge -r41575:41602 ^/trunk/blender 2011-11-07 07:01:24 +00:00
Joshua Leung
e03fdd8112 Second attempt at getting rid of bsystem_time() 
Hopefully this fixes Collada. Can't really compile that to check
here...
 2011-11-06 12:12:14 +00:00
Campbell Barton
e936c78251 svn merge ^/trunk/blender -r41503:41575 2011-11-06 10:38:44 +00:00
Brecht Van Lommel
647447db58 Code refactoring: split lamp functions from object.c into new lamp.c. 2011-11-05 13:11:49 +00:00
Brecht Van Lommel
9884129117 Code refactoring: split camera functions from object.c into new camera.c. 2011-11-05 13:00:39 +00:00
Sergey Sharybin
4ea816837d Configurable sensor size: 
- Added support of variable size sensor width and height.
- Added presets for most common cameras, also new presets can be defined by user.
- Added option to control which dimension (vertical or horizontal) of sensor
  size defines FOV. Old behavior of automatic FOV calculation is also kept.
- Renderer, viewport, game engine and collada importer/exporter should
  deal fine with this changes. Other exporters would be updated soon.
 2011-11-04 14:36:06 +00:00
Campbell Barton
f5d5de0d8a fix for compiling collada by nico_ga 2011-10-28 06:12:00 +00:00
Campbell Barton
699030ceb6 use const for readonly strings and set some functions to static 2011-10-27 14:41:26 +00:00
Guillermo S. Romero
82c84f4b58 Remove some more $Id$ that still were left after r41227 and r41228. 2011-10-23 19:01:59 +00:00
Guillermo S. Romero
6105199668 Remove the svn:keywords property. 2011-10-23 18:38:16 +00:00
Campbell Barton
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Brecht Van Lommel
e417e011d5 Code cleanup: file operations merged into single header, some function names 
made less cryptic and changed to indicate if they work on files or directories.
 2011-10-22 15:35:49 +00:00
Brecht Van Lommel
88473fd49a Code cleanup: remove BLI_exist, now there is only BLI_exists. One function just 
called the other, they did the same thing.
 2011-10-21 22:33:41 +00:00
Campbell Barton
ef218c75ed - add convenience functions BLI_split_dir_part / BLI_split_file_part, which just call BLI_split_dirfile(). 
- add a fixed value for bprogdir (the dir of bprogname), since it was being used for resource lookups.
 2011-10-21 02:13:36 +00:00
Campbell Barton
5cf593a778 strcpy() --> BLI_strncpy(), where source strings are not fixed and target size is known. 2011-10-19 23:10:54 +00:00
Campbell Barton
317b649bb2 fix for buffer overrun with BLI_split_dirfile(...), was simple to do since many places don't check for filename lengyj of 79 chars which is the limit for the file selector. 
Add max dir and file length args.
 2011-10-15 03:56:05 +00:00
Campbell Barton
0c0259d931 fix [#28909] OpenCollada export / import sintel lite v2.1 crashes on import. 2011-10-14 02:31:04 +00:00
Campbell Barton
018fa1540e whitespace edits, make formatting for functions consustent at least within the file. 2011-09-28 05:53:40 +00:00
Campbell Barton
274b9c8fb8 whitespace cleanup 2011-09-25 12:31:21 +00:00
Campbell Barton
a20bcb4613 clear up some warnings. 2011-09-22 14:42:29 +00:00
Campbell Barton
13dfd82997 changes for materials to treat them as shorts not int/chars (since they are stored as shorts intermally) 
- converting nurbs to mesh was casting the material to unsigned char.
- subsurf was casting to char, then int -> short in a loop.
- have material functions take & return shorts.
 2011-09-20 06:25:15 +00:00
Campbell Barton
d4898f9c40 use macros RAD2DEG & DEG2RAD rather then multiplying by 180.0/M_PI or M_PI/180.0 2011-09-17 09:43:51 +00:00
Campbell Barton
97c78e25f0 fix for opencollada crash with r40164, missing NULL check. 2011-09-12 13:59:23 +00:00
Nathan Letwory
1dcf9c636c Fix [#28614] Collada Exporter does not export Ambient term 
reported by Steiner Bernhard

ma->ambX is calculated only on a render, so instead of relying on those values compute them manually.
 2011-09-12 13:20:24 +00:00
Nathan Letwory
4a9a0ec3e4 Code shuffle so function has only one exit point. 2011-09-12 10:57:41 +00:00
Campbell Barton
357febc168 fix for building with collada and some other warnings 2011-09-10 09:38:38 +00:00
Nathan Letwory
3dc0ee19c4 Introduce struct for export settings in COLLADA export code. This will make it easier to 
add new options without having to change function signatures all over the place.
 2011-09-07 18:23:30 +00:00
Nathan Letwory
5fa7452559 Attempt to fix compile error on OSX 2011-09-07 07:02:56 +00:00
Nathan Letwory
9baff83d72 Split off scene export code. 2011-09-06 22:18:12 +00:00
Nathan Letwory
6e9ff495eb Add parser error handler. 
OpenCOLLADA is a validating parser, so is pretty strict about document form. The added error handler will print out any errors the parser finds. A pop-up will be shown too, advising the user to check the console for the error log.
 2011-09-05 20:41:58 +00:00
Brecht Van Lommel
a6d9a5a972 Code cleanup: warning fixes. 2011-09-05 19:27:21 +00:00
Nathan Letwory
cc1c8268f7 Left debug print accidently enabled. 2011-09-05 15:03:31 +00:00
Nathan Letwory
5c5b9cf4d7 Remove NULL-checks, as they might cause infinite loops while reading a DAE containing unsupported data, i.e. <lines> geometry. 2011-09-04 22:14:28 +00:00
Nathan Letwory
1cada203bc [#27884] Collada import: materials mismatch when 2 instance_geometry reference the same material 
Reported by David Roy

Multi-materials used on different meshes would get ignored (resulting in white faces in textured view).
 2011-09-04 14:31:23 +00:00
Nathan Letwory
caa1acb6b1 Prevent potential crasher, commonEffects could be empty. 2011-09-04 02:12:03 +00:00
Nathan Letwory
cbc812b757 Fix [#28322] COLLADA imports messed up UVs 
Reported by Chad Gleason

Imported index order could put mface->v4==0. We already know amount of verts, so use that instead.
 2011-09-04 01:13:44 +00:00
Nathan Letwory
1764f2135d Some whitespace changes 2011-09-04 00:15:59 +00:00
Campbell Barton
451136e7c0 warning fixes 2011-09-03 15:36:36 +00:00
Nathan Letwory
d0d82c69e9 COLLADA: Take parent bone length and direction instead of using bone pointing up with length 1. Looks much nicer and less confusing on larger armatures now. 2011-08-31 09:37:14 +00:00
Guillermo S. Romero
5ac81bfe9c SVN maintenance. 2011-08-30 19:38:32 +00:00
Nathan Letwory
c6f994062e Check for potential crasher. 
Reported and suggested in [#27687] by Dean Giberson. Couldn't redo crash myself, but better safe than sorry :)
 2011-08-30 15:43:00 +00:00
Joerg Mueller
9424b1ceff Merging pepper to trunk at revision 39791. 
Important note: I used rsync to do the local merge, as "svn merge --reintegrate ^/branches/soc-2011-pepper" doesn't work with our svn server right now!
 2011-08-30 09:15:55 +00:00
Joerg Mueller
43ab8e8624 * Merge trunk up to r39790. 
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
 2011-08-30 08:22:03 +00:00