griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,616 Commits 1 Branch 0 Tags
da170d9dc3dd84f1b77f737a94d5863b0d67dd21
Commit Graph

849 Commits

Author SHA1 Message Date
Campbell Barton
671cb93f1b svn merge -r36801:36840 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-24 04:35:21 +00:00
Campbell Barton
d0e4f7b9f2 remove unused code, comment some that may be useful (maintainers can remove). 2011-05-23 15:23:31 +00:00
Campbell Barton
33bfcb26b8 manually copy more changes from trunk. 2011-05-12 09:02:39 +00:00
Campbell Barton
0f329ebdf1 svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-11 00:19:13 +00:00
Campbell Barton
89a166d0de remove some duplicate declarations 2011-05-10 14:48:06 +00:00
Campbell Barton
21a9dc8d8b svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-10 00:45:06 +00:00
Campbell Barton
1e0c3d315b minor cleanup, no functional changes. 2011-05-09 14:41:44 +00:00
Campbell Barton
14a2330d7b copied across changes which were missed by merging. 2011-05-09 02:45:52 +00:00
Joseph Eagar
6ef77cf95a =bmesh= merge from trunk at r36529 2011-05-08 23:43:18 +00:00
Brecht Van Lommel
a9b066a9c6 Fix for recent glsl commit, forgot to include this file. 2011-05-02 15:59:24 +00:00
Brecht Van Lommel
14d7d480df Fix #26807: glsl diffuse/specular was not clamping negative values, giving 
some inconsistent results with the renderer.
 2011-05-02 14:01:45 +00:00
Brecht Van Lommel
7f4b4bbaf0 Fix #26697: glsl color management + vertex color was not working right. 2011-05-02 13:52:41 +00:00
Brecht Van Lommel
bee2523a41 Related to bug #27004: there is now an option to disable color management for 
GLSL. I've tried to find a quicker way to do it that still looks the same, but
couldn't find a formula that didn't have major color shifts.
 2011-05-02 09:08:43 +00:00
Campbell Barton
f9f771cd01 converted more mixed tab/space indentations to tabs. only whitespace changes. 2011-04-21 15:53:30 +00:00
Campbell Barton
210ee1ade4 whitespace only, no functional change mixed tabs/spaces --> tabs. 2011-04-21 13:11:51 +00:00
Campbell Barton
71f571a54d fix [#26955] GL Texture Size doesn't work. 
Brecht: reverting this change you made r22532, which I cant see a reason for.
 2011-04-16 09:26:45 +00:00
Joseph Eagar
c98148a963 =bmesh= merge from trunk at r36153 2011-04-15 01:19:13 +00:00
Campbell Barton
ca254dd37b add option WITH_BUILTIN_GLEW, so linux packagers can disable to use their own glew library. 2011-04-05 23:31:01 +00:00
Campbell Barton
0298d223cc quiet various warnings, also disable -Wdouble-promotion with cmake since it gives warnings with variable length args. 2011-04-03 10:04:16 +00:00
Campbell Barton
69bd72c3b6 quiet gcc float -> double promotion warnings. 2011-04-02 02:08:33 +00:00
Campbell Barton
e7bf671e25 se BLI_snprintf() for msvc compat, cleanup CMake file, some bad comments left in. 
also on only try build RPM's on linux.
 2011-03-07 03:57:04 +00:00
Nathan Letwory
12ec60ca46 Ensure gpu_extensions.c compiles with MSVC -> include BLI_winstuff.h 2011-03-07 00:49:21 +00:00
Campbell Barton
627c764e3c bug [#26329] Project Paint not working 
we cant ensure that a requested buffer can be allocated so report opengl errors when failing to allocate the buffer (rather then printing to console).

this is common enough and generic error isn't too helpful to users.
 2011-03-06 23:12:12 +00:00
Campbell Barton
c7fccc84bf use NULL rather then 0 for pointer assignments & comparison, modifier, imbuf & editors. 2011-03-05 10:29:10 +00:00
Campbell Barton
709c727c51 replace 0 with NULL when used as a pointer 2011-03-03 17:58:06 +00:00
Nathan Letwory
93b144548d doxygen: blender/gpu tagged. 2011-02-27 20:25:53 +00:00
Joseph Eagar
f01261d040 merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00
M.G. Kishalmi
d7c29a0310 since the introduction of 'newbump' blender 
was exporting normal maps with red and green channel inverted
relative to the geometry it actually exports.

This change makes blender export normal maps 
which are very similar to most tools out there.

patch by Morten S. Mikkelsen
 2011-02-23 11:58:36 +00:00
Nathan Letwory
5b607701a7 doxygen: prevent GPL license block from being parsed as doxygen comment. 2011-02-23 10:52:22 +00:00
Nathan Letwory
322ff7dfe4 I swear, it was just an innocence change in guardedalloc! 
The butterfly wing flap, causing a nice storm in the rest of blender.

Now all dependencies should point ok again. CMakers, do double-test.
 2011-02-21 12:35:04 +00:00
Nathan Letwory
8c8ae3dedf doxygen: entry for gpu, modifiers, nodes, python and render 2011-02-21 06:58:46 +00:00
Campbell Barton
06aee2ef0e misc warnings/fixes 
- WITH_OPENJPEG wasn't defined for creator.c with CMake.
- remove shadowed/redefined vars.
- remove some unused RNA report args.
- re-arrange IMB_FILE_TYPES so IRIS is not the first format tested, since its not very common test JPEG and PNG first.
 2011-02-20 15:48:01 +00:00
Campbell Barton
27e812d697 Clear some compiler warnings by commenting some functions, adding others to headers. 
left in warnings where functions obviously need to get ported to 2.5x still.

Also, render stamp seq strip works again.
 2011-02-17 22:34:41 +00:00
Lukas Steiblys
610917d52e removed some more magic constants 
another fix: the patch for #25806 was submitted by Riakiotakis Antonis and not by Andrew Wall
 2011-02-15 19:22:08 +00:00
Lukas Steiblys
7fba9eab47 added more code comments and removed some magic constants 2011-02-15 19:04:00 +00:00
Lukas Steiblys
15570631fd a fix for bug #25806 
http://projects.blender.org/tracker/index.php?func=detail&aid=25806
Thanks Andrew Wall for the report and the patch
 2011-02-15 18:36:42 +00:00
M.G. Kishalmi
20553d4064 This commit will switch blender to use tangent space generated within 
the two files mikktspace.h and mikktspace.c. These are standalone files
which can be redistributed into any other application and regenerate the
same tangent spaces. The implementation is independent of the ordering
of faces and the vertex ordering of faces.
 2011-02-14 18:18:46 +00:00
Campbell Barton
59f1640ae5 warning cleanup. 
- fix mistake with grease pencil UI (&& was intended but & used).
- use (void) rather then () across _all_ blenders code.
- a few minor edits, don't shadow stack variables in roll calculation & avoid running memset() for VBO vertex map.
 2011-02-13 15:02:21 +00:00
Campbell Barton
4124804b4e many functions in blender are not marked static but should be. 
most local modifier,GPU,ImBuf and Interface functions are now static.

also fixed an error were the fluid modifier definition and the header didnt have the same number of args.
 2011-02-13 14:16:36 +00:00
Campbell Barton
d240206c88 fix for crash with GLSL material when image couldn't be loaded. 
also quiet pep8 warnings.
 2011-02-10 14:59:17 +00:00
M.G. Kishalmi
1bfd780456 fix: latest shader wasn't working on itel gfx-cards 
couldn't use 
a = ( float_function() < 0 )? b: c;
for whatever reason.
 2011-02-08 13:40:54 +00:00
M.G. Kishalmi
16160f5fcc GLSL shader part 
bump-mapping update to properly support
multiple textures in different bump-spaces.
 2011-02-07 21:57:40 +00:00
M.G. Kishalmi
1b28e8c162 moved texture_space scaling factor from glsl to C. 2011-01-30 16:57:28 +00:00
M.G. Kishalmi
d5da54e1e6 bugfix #25867 
fix for objectspace bumpmapping
 2011-01-30 16:24:23 +00:00
Campbell Barton
89c617a116 remove nan-makefiles 2011-01-30 15:29:22 +00:00
Ton Roosendaal
9400f4309a Fix for object-space bumpmapping in GLSL. Fix provided 
by Morten Mikkelsen in IRC.
 2011-01-30 14:43:24 +00:00
Ton Roosendaal
bcacaa3901 Fixes for GLSL bump code; it was using calls not supported for 
older GLSL versions (< 1.3)

Thanks Matthew M:
- adding mat3 from ma4 function
- removal of transpose()

And I've hacked in myself a textureSize() replacement, the image
size gets passed on to function now.
 2011-01-29 16:13:15 +00:00
M.G. Kishalmi
50d434f2f4 matching 3Dview GLSL shaders for the new bumpmapping methods 2011-01-29 12:01:11 +00:00
Campbell Barton
eac31a2ece remove unused vars & avoid some clang warnings. 2011-01-14 21:06:28 +00:00
Campbell Barton
8227b3d463 remove/comment unused vars 
also removed unnecessary NULL checks (where the pointer was used later without checking).
 2011-01-13 04:53:55 +00:00