griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
25,889 Commits 1 Branch 0 Tags
0a6e7fbfc6a83f00a2acb651a66ea33d8be2e01d
Commit Graph

145 Commits

Author SHA1 Message Date
Joseph Eagar
bb7339a7ae merge with trunk at r31523 2010-09-04 05:31:25 +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
Joseph Eagar
8bcb71aebd [finally! the commit went through] 
=bmesh=

First pass at post-merge stabilization.  Seems to work well enough now, but
I need to do more testing.  Also need to go through bmesh_class.h and make
sure the design/headers there make sense.
 2010-07-22 00:18:35 +00:00
Joseph Eagar
c11c196efa part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :) 2010-07-19 04:44:37 +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
Brecht Van Lommel
267c286091 Fix compile error after merge, gpu_buffers.h -> GPU_buffers.h. 2010-07-14 14:31:27 +00:00
Jason Wilkins
5505697ac5 Merge GSOC Sculpt Branch: 28499-30319 
https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins
See log of that branch for details.
 2010-07-14 14:11:03 +00:00
Brecht Van Lommel
f406cf4ac8 Fix a few compile warnings and rename gpu_buffers.h to GPU_buffers.h 
for consistency.
 2010-07-14 10:46:12 +00:00
Campbell Barton
3580d6229a - text3d was missing menu items for toggling bold/underline/italic/smallcaps. 
- made smallcaps use a temp flag so caps can still have the smallcaps flag.
- utility function for getting the char from a font. find_vfont_char(), was inline in ~5 places.
- removed CU_STYLE mix of flags only used in one place, not needed. removed 'style' from rna too.
- fix for some warnings.
 2010-07-13 23:51:21 +00:00
Brecht Van Lommel
ee03a99695 Fix #20461: deleting VBO's from threads used for rendering or baking would 
crash, as OpenGL can't be called from these. Now deleting VBO's is delayed
until the next redraw in the main thread.
 2010-07-13 13:31:43 +00:00
Brecht Van Lommel
90162cb0cb Fix #21894: backface selection wasn't working correct with < 24 bits colors, 
e.g. thousands of colors on OS X, due to use of uninitialized value. Problem
tracked down and patch provided by Shane Ambler, thanks!
 2010-07-04 12:24:19 +00:00
Nicholas Bishop
bd4d743db9 * Made sculpt drawing respect the "use VBO" preference. 
* Hopefully this fixes some sculpt problems for people with broken drivers
 2010-06-30 19:35:08 +00:00
Campbell Barton
0ac1564f68 opengl render was freeing all images from the graphics card each update. 
with some 4x4k and 4x8k textures this becomes very slow.

only free animated textures (movies and sequences)
 2010-05-20 16:08:06 +00:00
Campbell Barton
389e590460 ghash alloc string from render branch 
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r28571:28573
 svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r28575:28576
 2010-05-07 07:54:25 +00:00
Brecht Van Lommel
0c495ffe10 Fix for GPU_free_unused_buffers deadlock, solution by Tamito Kajiyama, thanks! 2010-05-05 17:14:43 +00:00
Brecht Van Lommel
3f12beb4d0 Fix #22123 and #22124: some problems with mutex locks, also tweak to 
how removing opengl textures from outside main thread is done so it
happens as part of the main loop.
 2010-04-25 10:49:13 +00:00
Campbell Barton
ace1c998c4 warning cleanup, also made voxel.c and volumetric.c use BM_INLINE define rather then having their own ifdefs in each file. 2010-04-24 10:08:07 +00:00
Guillermo S. Romero
7d9067ca2c Make memstat easier to read, add missing Intel ID and cleanups. 2010-04-14 21:12:05 +00:00
Joseph Eagar
0d557969b8 used private mutexes to avoid deadlocks 2010-04-13 20:34:40 +00:00
Joseph Eagar
86aa4e5c3d prevent images from freeing gpu buffers if not run within the main thread, instead they are queued to be freed the next time GPU_image_free() is run from the main thread. 2010-04-13 12:51:03 +00:00
Dalai Felinto
c1a9d4d7a3 Bugfix: 21586 - UI problems with Tiled Textures (animatable for GE) 
The problem was present in Blender 2.49, but it didn't produce any side effect.
glScale was changing the texture matrix and the matrix was never been reset. That messes up with UI drawing.
 2010-04-08 20:58:18 +00:00
Brecht Van Lommel
ec5527cb52 Fix #21349: triple buffer drawing doesn't work well with thousands of 
colors setting on Mac, just disabled it in that case.
 2010-04-05 10:25:40 +00:00
Brecht Van Lommel
49271a2fea Fix #21667: smoke drawing crashes calling glTexImage3D on graphics card that do 
not support it.
 2010-03-27 10:48:01 +00:00
Brecht Van Lommel
a2778a262b Fix #20548: flat shading not drawing right in sculpt mode. 2010-03-22 17:17:36 +00:00
Campbell Barton
1e9bf0cfdb spaces -> tabs, (4 spaces == 1 tab, only for white space preceding text) 2010-03-22 09:30:00 +00:00
Joseph Eagar
71003b9bcc merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge 2010-03-09 04:32:40 +00:00
Brecht Van Lommel
1b30b13a4d Fix #21227, #21346 and #21336: image texture wasn't centered correctly 
when sculpting and using it from material nodes.
 2010-03-01 18:11:09 +00:00
Lukas Steiblys
1a6f683b43 another attempt at fixing the VBO buffer deletion bugs 2010-02-17 18:48:02 +00:00
Lukas Steiblys
866ecdebe7 added some more error checking for buffer allocation and fixed it up a bit. Hopefully this won't introduce new bugs and fix old ones. 2010-02-15 19:09:59 +00:00
Ton Roosendaal
b673f7318c Added support for animated texture draw, GLSL textures. 
Note, this is not like GE ffmpg, but Blender Image Texture
display for GLSL materials. Speed can be disappointing,
use smaller images for realtime edits.
 2010-02-13 13:09:30 +00:00
Campbell Barton
081c1205a3 correct fsf address 2010-02-12 13:34:04 +00:00
Campbell Barton
051c6e999f partial fix for [#21036] crash with glsl shading 
copying UVs was doing a buffer overrun.
 2010-02-08 21:19:15 +00:00
Brecht Van Lommel
58b89bbac3 Fix sculpt mode drawing performance regression, happened on at least 
NVidia/Linux. Disabling GL_MULTISAMPLE apparently makes things go much
slower even though we're not using it, why is a mystery to me.
 2010-02-01 19:22:54 +00:00
Brecht Van Lommel
fe555522f1 GPU type detection tweaks for unix/mac software rendering. 2010-02-01 10:04:37 +00:00
Brecht Van Lommel
87bbb2d827 WM Draw Methods now has a new option Automatic (default). This will 
set the draw method to triple buffer or overlap depending on the
configuration. Ideally I could get all cases working well with triple
buffer but it's hard in practice. At the moment there are two cases
that use overlap instead:

* opensource ATI drives on linux
* windows software renderer

Also added a utility function to check GPU device/os/driver.
 2010-01-31 23:45:51 +00:00
Brecht Van Lommel
127b3e6882 Fix #20879: crash when add textures brush in sculpt mode. Drawing 
the texture would crash because the VBO was still bound. As I
understand it this is not necessarily against the opengl spec,
but might as well unbind it, the driver bug seems to have been
fixed but has not trickled down everywhere yet.

http://bugs.freedesktop.org/show_bug.cgi?id=23859
 2010-01-31 15:06:20 +00:00
Brecht Van Lommel
91882d3ba1 Fix #19980: crash with opengl render active viewport. 2010-01-30 09:53:55 +00:00
Brecht Van Lommel
2b352211f4 Fix #19875: drawing smoke on graphics cards that do not support 
non-power-of-two textures lead to artifacts due to uninitialized
memory if the domain had a non-power-of-two size.
 2010-01-30 09:24:50 +00:00
Campbell Barton
083e5b66a9 GPU_buffer_setup could return a freed buffer. (when VBO's were used) 2010-01-16 17:47:56 +00:00
Joseph Eagar
219b472920 merge with trunk/2.5 at r25907 2010-01-13 07:26:11 +00:00
Brecht Van Lommel
ccb54eff2e FSAA: properly disable it for first window draw, remove obsolete backbuffer 
disable code, and only enable it for 3d drawing in the 3d view.
 2010-01-08 09:30:36 +00:00