griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,298 Commits 1 Branch 0 Tags
0a4eb24ca0e0cf7e4e1b615e0929ec50bf030d74
Commit Graph

171 Commits

Author SHA1 Message Date
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
Campbell Barton
c35db522da variable 'pool' could be accessed as NULL, globalPool was allocated but not assigned before use. 
also remove unused vars.
 2011-01-08 10:13:59 +00:00
Campbell Barton
89c9aaaa25 remove references to BKE_utildefines where its not needed. 
- move GS() define into DNA_ID.h
- add BLI_utildefines as an automatic include with makesrna generated files.
 2011-01-07 19:18:31 +00:00
Campbell Barton
8f21a43535 split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h. 
no functional changes.
 2011-01-07 18:36:47 +00:00
Ton Roosendaal
b067a85aa3 Todo item: 
Object color option now is incorporated in preview render, and
in display in 3D window.

Note that Object-color is "modulating" the render result, it just
multiplies... which is very limited for practical use. This was
added for Apricot game project. The original meaning however was
to replace diffuse only... so specular and light work still correct.

ALso made header for properties editor start on top, to reflect
default (report in tracker).
 2011-01-05 15:10:35 +00:00
Campbell Barton
902b239aa8 no functional changes: SETLOOPER macro assumed a scene was defined called 'sce' used to loop over, now make this an argument, helps to make it clear what's going on. 2010-12-17 15:37:59 +00:00
Campbell Barton
263830f000 Enabled GCC -Wwrite-strings warning for CMake and replaced many 'char's for 'const char's,. 
Only one functional change where Transform orientations passed "" to BIF_createTransformOrientation() which could then have the value written into.
 2010-12-03 17:05:21 +00:00
Campbell Barton
cd97253502 - added GCC warning -Wstrict-prototypes 
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
 2010-12-03 12:30:59 +00:00
Guillermo S. Romero
9d3a17922c Detect Gallium driver. Extend NPoT workaround to opensource drivers. 2010-11-27 19:59:00 +00:00
Lukas Steiblys
d3ec9753c4 freeing all free GPU buffers every frame could be a performance issue and is not necessary 2010-11-26 11:20:03 +00:00
Janne Karhu
b0df3a29f2 ATI X1xxx gfx cards (R500 chipset) lack full support for npot textures although they report the GLEW_ARB_texture_non_power_of_two extension. 2010-11-25 22:15:04 +00:00
Lukas Steiblys
b9b9ac75bc fix for https://projects.blender.org/tracker/index.php?func=detail&aid=24442&group_id=9&atid=498 
[#24442] GLSL + VBOs
 2010-11-25 17:36:03 +00:00
Mitchell Stokes
32eba0898b Reverting revision 33120, which added vram monitoring. The method used had some problems (especially in the freeing function). I will research an alternative solution and submit it to the tracker. 2010-11-24 06:27:07 +00:00
Ton Roosendaal
aef3e99eab Bugfix #22052 
OpenGL viewport render gave squeezed results in cases.
Reason: some graphics cards only give offscreen buffers in multiples
of 256 or 512 (my case). 

Current fix uses the actual size returned by graphics card, which
is also safe for too large renders.
More elaborate cropping or matching is for another time.

(Added printf for feedback on this, might disappear)
 2010-11-18 19:11:05 +00:00
Mitchell Stokes
1bb98b4194 Adding monitoring for (approximate) VRAM used by textures. The information is currently only used in the profiling data of the BGE. 
Here is a image of it in action:
http://www.pasteall.org/pic/show.php?id=6351

What it monitors:
  * VRAM used by textures created via bf_gpu and BL_Textures

What it does not monitor:
  * VRAM used by the Blender ui
  * VRAM used by 2d filters
  * VRAM allocated by the user via KX_Scene.pre_draw and KX_Scene.pre_draw
 2010-11-17 05:28:25 +00:00
Campbell Barton
4661fb03a9 bugfix [#24704] UV editor: [x] modified does not update on change of modifiers 
- VBO UV Edge display wasn't allocating a large enough array for drawing.
- VBO UV Edge drawing was using an edge flag with faces.
- notifier for modifiers updating the UV window.
 2010-11-15 08:03:20 +00:00
Campbell Barton
369a5cc29e fix for compiling with the c90 standard, support for non-static variable initializers is a c99 feature. 2010-11-02 13:12:30 +00:00
Campbell Barton
3367ef8b65 initialize structs to zero rather then using memset(). 2010-10-31 15:39:37 +00:00
Campbell Barton
97784a7186 fix for warnings & detecting opensource nouveau drivers. 2010-10-22 01:06:21 +00:00
Campbell Barton
e51bb1fb0e bugfix/workaround for ../../radeon/radeon_cs_gem.c:181: cs_gem_write_reloc: Assertion `boi->space_accounted' failed. [#656100] 
reported on launchpad.

calling glClear(GL_COLOR_BUFFER_BIT); was crashing blender,
since this is only used to blank the window before its drawn, disable for opensource ATI drivers.
 2010-10-22 00:29:56 +00:00
Campbell Barton
db09ca106d remove/tag unused args for view*.c, gpu*.c & image*.c 2010-10-15 12:29:02 +00:00
Campbell Barton
8a4fe62843 misc fixes found with clang's static checker. 2010-10-07 10:04:07 +00:00
Campbell Barton
a7258c9651 - fix for crash when drawing a subsurf after a modifier that lost original indices (bevel/screw/decimate) 
- fix for own mistake used madd_v3_v3fl rather then mul_v3_v3fl, r32241.
 2010-10-05 11:16:07 +00:00
Campbell Barton
db1b74654b - spec hardness was missing redraw update 
- missed rna rename in image ui
- use BLI_math functions in gpu_draw.c (no functional changes)
 2010-10-02 06:34:04 +00:00
Campbell Barton
677b9a194f need to set GL_SHININESS to the default value for weight painting. 2010-09-28 11:08:45 +00:00
Campbell Barton
dbd5524970 show material hardness in solid shaded mode 2010-09-27 07:01:08 +00:00
Campbell Barton
62c7786cd9 use a struct for fixed materials rather then float[2][4], easier to follow (no functional change) 2010-09-27 06:49:27 +00:00
Campbell Barton
a992fec4e7 bugfix 
- image filepath in the image view would only be set when first loading a frame.
- check to free animated image buffers on opengl render was comparing against the wrong value.
 2010-08-25 02:32:02 +00:00
Benoit Bolsee
9b685a4b78 Fix quasy systematic crash at Blender exit: globalPool was released twice 2010-08-23 21:31:57 +00:00
Campbell Barton
d1759639dc - remove unused includes IMB_*, BIF_* & MEM_* 
- remove MEM_guardedalloc.h from header files (include directly)
 2010-08-16 05:46:10 +00:00
Brecht Van Lommel
60a8fc3759 Fix #23303: glsl color correction not working correct for image textures. 2010-08-15 09:34:18 +00:00
Guillermo S. Romero
95aa8cfa4a Update address in license block. 2010-08-10 21:22:26 +00:00
Campbell Barton
9db1f87531 remove unused includes 2010-08-08 13:11:13 +00:00
Tom Musgrove
dc3c979ac8 after discussion with brecht reverting this commit, will pass on feedback to the patch author 2010-08-06 18:40:05 +00:00
Tom Musgrove
8c80f623f4 Committing Konrads GLSL preview of bumpmapping, now we no longer have the bizarre situation of being able to view the changes of the normal map but not of regular bump mapping 2010-08-06 17:42:47 +00:00
Tom Musgrove
e2f5f4fa53 removing the f so that glsl shaders work on older cards 2010-08-03 22:44:15 +00:00
Brecht Van Lommel
3b9b4f7605 Fix #23103: 
* missing glsl update when changing color management setting
* disable glsl lamps only when disabling them for render
 2010-07-30 10:44:00 +00:00
Brecht Van Lommel
3f06cab75e Fix #23073: glsl and 3d view background color didn't take color managment into 
account yet, should now be consistent with render.
 2010-07-29 10:09:20 +00:00
Brecht Van Lommel
c0ba0c1171 Fix #22986: glsl didn't take object hiding into account yet for lamps. 2010-07-27 11:10:34 +00:00
Brecht Van Lommel
f6ae7af243 2.5: automatic draw method now uses overlap for Intel on all platforms. 2010-07-16 10:13:04 +00:00