http://www.miikahweb.com/feed.php MiikaHweb - Blender Temp_viewport_fx_merge Branch http://www.miikahweb.com/ MiikaHweb - Blender Temp_viewport_fx_merge Branch fi Wed, 27 Jan 21 13:21:16 +0000 MiikaHweb RSS contact at miikahweb.com <![CDATA[[1949987]: Painstakingly merge branch 'master' into temp_viewport_fx_merge...]]> http://www.miikahweb.com/en/blender/git-logs/commit/194998766c651750acbc74049a7467b55169a641 1949987
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Painstakingly merge branch 'master' into temp_viewport_fx_merge

This branch will not make it into blender, however there are a few things that might be useful here for people who work on the viewport project and could be merged to master:

* Matrix stacks
There is working code for matrix stacks in gpu_matrix.c. Basically it works by overriding all draw calls with a special version that loads our custom stack in OpenGL. To refactor this out, coders should do this in three stages:

1) Inspect all calls to GPUBegin/GPUDraw*/GPURect* and only add one call to upload the matrices once to the relevant uniform of the shader, then substitute with the normal GL call.

2) Remove all hardcoded GL matrices from shaders. Shaders should use generic uniforms/uniform blocks for matrices

3) Do not use GL-style stacks. Actually stacks should be generic and local, not global. We do not care about a global projection/modelview etc matrix, rather we want to add matrix stacks locally in places where they are needed and upload those matrices to our shaders. The code can be generalized to do that by substituting the enum in the gpuMatrix* functions with a GPUMatrixStack* though it will be slightly tedious to do - like everything viewport related.

* GLU removal:

This branch also removes glu completely from blender by providing a helper library that handles drawing of some helper shapes. The way this is handled is not ideal, since it uses the GSOC code that is not the way we want to do things here, however it could be improved and made with a proper design.

There are some graphical glitches still here, but should be fixable.

----------------------------------------
0 Paths Changed]]>
Sun, 19 Jun 2016 19:17:17 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/194998766c651750acbc74049a7467b55169a641Antonis Ryakiotakis
<![CDATA[[7e0a3c2]: Merge branch 'master' into temp_viewport_fx_merge]]> http://www.miikahweb.com/en/blender/git-logs/commit/7e0a3c2c9e8598dddae89123bd5887da98419dc5 7e0a3c2
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Merge branch 'master' into temp_viewport_fx_merge

----------------------------------------
0 Paths Changed]]>
Mon, 11 May 2015 15:44:03 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7e0a3c2c9e8598dddae89123bd5887da98419dc5Antonis Ryakiotakis
<![CDATA[[942b98e]: Use stubs for glrecti/glrectf to make sure the matrix stacks...]]> http://www.miikahweb.com/en/blender/git-logs/commit/942b98e55cc6043ebc383b55109cddc7fa9b41ea 942b98e
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Use stubs for glrecti/glrectf to make sure the matrix stacks have been
committed.

----------------------------------------
30 Paths Changed]]>
Mon, 11 May 2015 16:02:15 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/942b98e55cc6043ebc383b55109cddc7fa9b41eaAntonis Ryakiotakis
<![CDATA[[333e589]: Merge branch 'master' into temp_viewport_fx_merge]]> http://www.miikahweb.com/en/blender/git-logs/commit/333e58919c20c06a1a77584610633c690462b3a1 333e589
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Merge branch 'master' into temp_viewport_fx_merge

Conflicts:
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform.c

----------------------------------------
0 Paths Changed]]>
Mon, 11 May 2015 09:33:03 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/333e58919c20c06a1a77584610633c690462b3a1Antonis Ryakiotakis
<![CDATA[[36f5dff]: Merge branch 'master' into temp_viewport_fx_merge]]> http://www.miikahweb.com/en/blender/git-logs/commit/36f5dffc6a712d634d3ce1cbf7a5ad9509668bcd 36f5dff
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Merge branch 'master' into temp_viewport_fx_merge

Conflicts:
source/blender/editors/gpencil/drawgpencil.c

----------------------------------------
0 Paths Changed]]>
Mon, 20 Apr 2015 09:01:12 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/36f5dffc6a712d634d3ce1cbf7a5ad9509668bcdAntonis Ryakiotakis
<![CDATA[[fc0e24b]: Blender displays fine again without errors, using the custom...]]> http://www.miikahweb.com/en/blender/git-logs/commit/fc0e24b05c9c692531afa0ffb072a9dc12508445 fc0e24b
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Blender displays fine again without errors, using the custom matrix
stacks.

Still need to replace glRect calls to completely fix it probably.

This still does not use the soc API properly.

----------------------------------------
6 Paths Changed]]>
Tue, 14 Apr 2015 20:15:17 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/fc0e24b05c9c692531afa0ffb072a9dc12508445Antonis Ryakiotakis
<![CDATA[[2fd4fc1]: Hello non crashy world! Still not 100% correct but at least...]]> http://www.miikahweb.com/en/blender/git-logs/commit/2fd4fc1f2d8a3589f0fb80befaeaaa61992d4223 2fd4fc1
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Hello non crashy world! Still not 100% correct but at least now it fires
up.

Issue was getting matrices from GL instead of own matrix stack

----------------------------------------
60 Paths Changed]]>
Tue, 14 Apr 2015 18:03:23 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/2fd4fc1f2d8a3589f0fb80befaeaaa61992d4223Antonis Ryakiotakis
<![CDATA[[394b815]: Substitute draw calls with a wrapper to make sure current matrix...]]> http://www.miikahweb.com/en/blender/git-logs/commit/394b81526109b1fcfcb191e130b61611d71a9b51 394b815
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Substitute draw calls with a wrapper to make sure current matrix stack
works.

----------------------------------------
73 Paths Changed]]>
Tue, 14 Apr 2015 13:23:13 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/394b81526109b1fcfcb191e130b61611d71a9b51Antonis Ryakiotakis
<![CDATA[[707ee19]: Trying to solve text crash issues]]> http://www.miikahweb.com/en/blender/git-logs/commit/707ee19146a52858f4375d45d2f5e39bc1009269 707ee19
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Trying to solve text crash issues

----------------------------------------
9 Paths Changed]]>
Tue, 14 Apr 2015 16:08:16 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/707ee19146a52858f4375d45d2f5e39bc1009269Antonis Ryakiotakis
<![CDATA[[7cea6ec]: Merge branch 'master' into temp_viewport_fx_merge]]> http://www.miikahweb.com/en/blender/git-logs/commit/7cea6ecddb4630961c1393ed2f1ada4aa81de1df 7cea6ec
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Merge branch 'master' into temp_viewport_fx_merge

Conflicts:
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_graph/graph_draw.c

----------------------------------------
0 Paths Changed]]>
Tue, 14 Apr 2015 12:13:02 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7cea6ecddb4630961c1393ed2f1ada4aa81de1dfAntonis Ryakiotakis
<![CDATA[[87cb1cc]: Merge branch 'master' into temp_viewport_fx_merge]]> http://www.miikahweb.com/en/blender/git-logs/commit/87cb1cc2e6b3fddc86b416faff6dffbf50eea963 87cb1cc
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Merge branch 'master' into temp_viewport_fx_merge

Also tried to use gpuMatrix calls where possible in new code
- might have missed a few places.

Conflicts:
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c

----------------------------------------
0 Paths Changed]]>
Fri, 10 Apr 2015 09:29:19 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/87cb1cc2e6b3fddc86b416faff6dffbf50eea963Antonis Ryakiotakis
<![CDATA[[0d4db6e]: Matrix API: explicitly set the matrix we tweak - much clearer...]]> http://www.miikahweb.com/en/blender/git-logs/commit/0d4db6e9e8c05324b9ae422118903c3a7a1ee870 0d4db6e
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Matrix API: explicitly set the matrix we tweak - much clearer this way and
we may even use explicit stacks in the future.

----------------------------------------
58 Paths Changed]]>
Fri, 03 Apr 2015 16:04:28 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0d4db6e9e8c05324b9ae422118903c3a7a1ee870Antonis Ryakiotakis
<![CDATA[[32b481f]: No declarations in for-loops and warning fixes for matrix pointers...]]> http://www.miikahweb.com/en/blender/git-logs/commit/32b481f873380b5f30dd8b88243449dd3e173254 32b481f
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
No declarations in for-loops and warning fixes for matrix pointers

----------------------------------------
17 Paths Changed]]>
Fri, 03 Apr 2015 13:51:09 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/32b481f873380b5f30dd8b88243449dd3e173254Antonis Ryakiotakis
<![CDATA[[4491627]: move glColor outside loop]]> http://www.miikahweb.com/en/blender/git-logs/commit/4491627bfacf43c7cea3d4bc3ff2cac302d1b513 4491627
Branches : temp_viewport_fx_merge
Author : Mike Erwin (merwin)
----------------------------------------
move glColor outside loop

instead of repeatedly setting the same color

----------------------------------------
1 Path Changed]]>
Thu, 02 Apr 2015 00:18:13 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4491627bfacf43c7cea3d4bc3ff2cac302d1b513Mike Erwin
<![CDATA[[49e0eff]: fix VAOs on Mac legacy context]]> http://www.miikahweb.com/en/blender/git-logs/commit/49e0eff55d64a92039b74c6d979830b0b01c4e41 49e0eff
Branches : temp_viewport_fx_merge
Author : Mike Erwin (merwin)
----------------------------------------
fix VAOs on Mac legacy context

Was causing crash on launch.

GLEW gives us glBindVertexArray and friends but sets them to NULL,
since Apple uses GL_APPLE_vertex_array_object instead of
GL_ARB_vertex_array_object. The ARB version evolved from the APPLE
version and they‚??re used in exactly the same way, so I aliased them to
keep our VAO code simple.

----------------------------------------
1 Path Changed]]>
Thu, 02 Apr 2015 00:13:45 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/49e0eff55d64a92039b74c6d979830b0b01c4e41Mike Erwin
<![CDATA[[53cfd47]: fix another Mac crasher]]> http://www.miikahweb.com/en/blender/git-logs/commit/53cfd4761c896399a81b7eb4d0974161fdd756c1 53cfd47
Branches : temp_viewport_fx_merge
Author : Mike Erwin (merwin)
----------------------------------------
fix another Mac crasher

According to LLDB everything we pass to glVertexPointer and
glDrawElements seems perfectly OK, but for some reason it crashes in
the driver.

With this change I was finally able to run this branch! Until sync-ing
with today‚??s matrix module.

----------------------------------------
1 Path Changed]]>
Thu, 02 Apr 2015 00:28:23 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/53cfd4761c896399a81b7eb4d0974161fdd756c1Mike Erwin
<![CDATA[[c3f3b95]: cleanup]]> http://www.miikahweb.com/en/blender/git-logs/commit/c3f3b958dc0b1d361fd3d600f2b64683a7dc0232 c3f3b95
Branches : temp_viewport_fx_merge
Author : Mike Erwin (merwin)
----------------------------------------
cleanup

no functional change

----------------------------------------
1 Path Changed]]>
Thu, 02 Apr 2015 00:15:32 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/c3f3b958dc0b1d361fd3d600f2b64683a7dc0232Mike Erwin
<![CDATA[[2d82d98]: Matrix module: substitution WIP.]]> http://www.miikahweb.com/en/blender/git-logs/commit/2d82d9866935e1d6cd6e0f6c9b5f93fedec8d41c 2d82d98
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Matrix module: substitution WIP.

Warning - don't open blender up or it will hang your computer

----------------------------------------
59 Paths Changed]]>
Wed, 01 Apr 2015 18:54:07 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/2d82d9866935e1d6cd6e0f6c9b5f93fedec8d41cAntonis Ryakiotakis
<![CDATA[[38125d3]: Small cleanup]]> http://www.miikahweb.com/en/blender/git-logs/commit/38125d3547041d31e57afcdfd1a7eaa69a351589 38125d3
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Small cleanup

----------------------------------------
3 Paths Changed]]>
Wed, 01 Apr 2015 18:54:07 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/38125d3547041d31e57afcdfd1a7eaa69a351589Antonis Ryakiotakis
<![CDATA[[7f1e982]: use reciprocals for vertex data conversion]]> http://www.miikahweb.com/en/blender/git-logs/commit/7f1e982da1fcb1f36889dcdc74fdfbf43150f202 7f1e982
Branches : temp_viewport_fx_merge
Author : Mike Erwin (merwin)
----------------------------------------
use reciprocals for vertex data conversion

* is faster than / even on modern CPUs. If we care to inline, speed is
a concern here.

----------------------------------------
1 Path Changed]]>
Wed, 01 Apr 2015 18:25:05 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7f1e982da1fcb1f36889dcdc74fdfbf43150f202Mike Erwin
<![CDATA[[8e49d81]: minor cleanup]]> http://www.miikahweb.com/en/blender/git-logs/commit/8e49d815d14451ac661f4bfb1e22f29702f7f9da 8e49d81
Branches : temp_viewport_fx_merge
Author : Mike Erwin (merwin)
----------------------------------------
minor cleanup

----------------------------------------
4 Paths Changed]]>
Wed, 01 Apr 2015 18:25:05 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/8e49d815d14451ac661f4bfb1e22f29702f7f9daMike Erwin
<![CDATA[[bf696c6]: more minor cleanup]]> http://www.miikahweb.com/en/blender/git-logs/commit/bf696c65fd197679ae6508866dd98d6def5e0bde bf696c6
Branches : temp_viewport_fx_merge
Author : Mike Erwin (merwin)
----------------------------------------
more minor cleanup

----------------------------------------
2 Paths Changed]]>
Wed, 01 Apr 2015 18:25:06 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/bf696c65fd197679ae6508866dd98d6def5e0bdeMike Erwin
<![CDATA[[c9f3339]: fix array range check]]> http://www.miikahweb.com/en/blender/git-logs/commit/c9f3339aa3c76808520b9bf791936e1af086e737 c9f3339
Branches : temp_viewport_fx_merge
Author : Mike Erwin (merwin)
----------------------------------------
fix array range check

Allowed writing past the buffer‚??s end.

Thanks, clang!

----------------------------------------
1 Path Changed]]>
Wed, 01 Apr 2015 18:25:05 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/c9f3339aa3c76808520b9bf791936e1af086e737Mike Erwin
<![CDATA[[d323c49]: More cleanup and interface resurrected]]> http://www.miikahweb.com/en/blender/git-logs/commit/d323c4904ee4999de2e01db96da5c4e0223b3768 d323c49
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
More cleanup and interface resurrected

----------------------------------------
1 Path Changed]]>
Wed, 01 Apr 2015 12:59:26 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/d323c4904ee4999de2e01db96da5c4e0223b3768Antonis Ryakiotakis
<![CDATA[[6cc93dc]: Fix an invalid operation]]> http://www.miikahweb.com/en/blender/git-logs/commit/6cc93dcc5ead1f347a8e2c38f8b5aed5d2ade1a3 6cc93dc
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Fix an invalid operation

----------------------------------------
1 Path Changed]]>
Wed, 01 Apr 2015 12:40:13 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/6cc93dcc5ead1f347a8e2c38f8b5aed5d2ade1a3Antonis Ryakiotakis
<![CDATA[[3fd766b]: Exit without leaks and crashes.]]> http://www.miikahweb.com/en/blender/git-logs/commit/3fd766ba383a436193427624454a60771cee5173 3fd766b
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Exit without leaks and crashes.

----------------------------------------
3 Paths Changed]]>
Wed, 01 Apr 2015 12:30:57 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/3fd766ba383a436193427624454a60771cee5173Antonis Ryakiotakis
<![CDATA[[b350e51]: More API changes, get rid of indexBufferDataGLSL (we can reuse...]]> http://www.miikahweb.com/en/blender/git-logs/commit/b350e51f532bf002bd80307a4d3aad645445a46c b350e51
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
More API changes, get rid of indexBufferDataGLSL (we can reuse vertex
streams effectively here)

----------------------------------------
1 Path Changed]]>
Wed, 01 Apr 2015 12:24:07 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/b350e51f532bf002bd80307a4d3aad645445a46cAntonis Ryakiotakis
<![CDATA[[14aca96]: Blender now runs without crashing, but still garbage on screen...]]> http://www.miikahweb.com/en/blender/git-logs/commit/14aca96652054cf4b5a8b9e55d34840059949cab 14aca96
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Blender now runs without crashing, but still garbage on screen.

----------------------------------------
3 Paths Changed]]>
Wed, 01 Apr 2015 12:12:11 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/14aca96652054cf4b5a8b9e55d34840059949cabAntonis Ryakiotakis
<![CDATA[[559a21d]: Changes to the gpu immediate API to reuse the new vertexstream...]]> http://www.miikahweb.com/en/blender/git-logs/commit/559a21d467e849ae3eeae58eac6f65565c9bd5f5 559a21d
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Changes to the gpu immediate API to reuse the new vertexstream
abstractions (still does not work)

----------------------------------------
1 Path Changed]]>
Wed, 01 Apr 2015 11:35:57 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/559a21d467e849ae3eeae58eac6f65565c9bd5f5Antonis Ryakiotakis
<![CDATA[[9e1aec6]: Some compilation fixes after merge]]> http://www.miikahweb.com/en/blender/git-logs/commit/9e1aec6c633bad3daf43d63cc6522a1a82ff855c 9e1aec6
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Some compilation fixes after merge

----------------------------------------
5 Paths Changed]]>
Wed, 01 Apr 2015 09:49:50 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/9e1aec6c633bad3daf43d63cc6522a1a82ff855cAntonis Ryakiotakis
<![CDATA[[9d85470]: Merge branch 'master' into temp_viewport_fx_merge]]> http://www.miikahweb.com/en/blender/git-logs/commit/9d854700d613210e26e9693bfde78afc566e07a9 9d85470
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Merge branch 'master' into temp_viewport_fx_merge

Conflicts:
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/gpu/GPU_extensions.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c

----------------------------------------
0 Paths Changed]]>
Wed, 01 Apr 2015 09:34:30 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/9d854700d613210e26e9693bfde78afc566e07a9Antonis Ryakiotakis
<![CDATA[[dd95926]: Fix compilation with scons]]> http://www.miikahweb.com/en/blender/git-logs/commit/dd95926c6e734a53346e2375b50f9572921143b0 dd95926
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Fix compilation with scons

----------------------------------------
5 Paths Changed]]>
Tue, 24 Mar 2015 16:41:57 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/dd95926c6e734a53346e2375b50f9572921143b0Antonis Ryakiotakis
<![CDATA[[3af88c6]: cleanup: code style]]> http://www.miikahweb.com/en/blender/git-logs/commit/3af88c69aaf883c35f8e653637249348c92cb994 3af88c6
Branches : temp_viewport_fx_merge
Author : Mike Erwin (merwin)
----------------------------------------
cleanup: code style

Mostly I wanted to go through the new GPU library code and learn it
thoroughly.

----------------------------------------
30 Paths Changed]]>
Mon, 23 Mar 2015 05:07:39 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/3af88c69aaf883c35f8e653637249348c92cb994Mike Erwin
<![CDATA[[96b0175]: delete redundant C++ file]]> http://www.miikahweb.com/en/blender/git-logs/commit/96b01755af14fe96441c8c8373f4a4e13946630d 96b0175
Branches : temp_viewport_fx_merge
Author : Mike Erwin (merwin)
----------------------------------------
delete redundant C++ file

gpu_lighting.c has all of this code.

----------------------------------------
1 Path Changed]]>
Mon, 23 Mar 2015 00:24:26 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/96b01755af14fe96441c8c8373f4a4e13946630dMike Erwin
<![CDATA[[85d5c78]: Blender compiles again and has most of the mising files now.]]> http://www.miikahweb.com/en/blender/git-logs/commit/85d5c78901d04bb8b9a0b370d45b8d5fce9a3ef0 85d5c78
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Blender compiles again and has most of the mising files now.

----------------------------------------
10 Paths Changed]]>
Wed, 18 Mar 2015 21:37:44 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/85d5c78901d04bb8b9a0b370d45b8d5fce9a3ef0Antonis Ryakiotakis
<![CDATA[[f707ffd]: Even more missing stuffs]]> http://www.miikahweb.com/en/blender/git-logs/commit/f707ffdd3abddcf6ed5f8bf165bf5703d94d3d9a f707ffd
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Even more missing stuffs

----------------------------------------
5 Paths Changed]]>
Wed, 18 Mar 2015 21:08:02 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/f707ffdd3abddcf6ed5f8bf165bf5703d94d3d9aAntonis Ryakiotakis
<![CDATA[[36ae264]: Still more files from branch that were left over uncommitted...]]> http://www.miikahweb.com/en/blender/git-logs/commit/36ae26472717b19ce5a90d5eec29f0ca402ffdff 36ae264
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Still more files from branch that were left over uncommitted.

----------------------------------------
17 Paths Changed]]>
Wed, 18 Mar 2015 21:00:34 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/36ae26472717b19ce5a90d5eec29f0ca402ffdffAntonis Ryakiotakis
<![CDATA[[1756984]: Basic shaders]]> http://www.miikahweb.com/en/blender/git-logs/commit/17569847e85c12b51d1fc193ea63d6a0830e97f1 1756984
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Basic shaders

----------------------------------------
4 Paths Changed]]>
Wed, 18 Mar 2015 19:27:54 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/17569847e85c12b51d1fc193ea63d6a0830e97f1Antonis Ryakiotakis
<![CDATA[[b6e99a6]: Blender now compiles (whee) but don't try to run it :p]]> http://www.miikahweb.com/en/blender/git-logs/commit/b6e99a672b4250c38d8544b8d33c9fd658caf800 b6e99a6
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Blender now compiles (whee) but don't try to run it :p

----------------------------------------
1 Path Changed]]>
Wed, 18 Mar 2015 19:29:35 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/b6e99a672b4250c38d8544b8d33c9fd658caf800Antonis Ryakiotakis
<![CDATA[[2f61341]: Move element indices to vertex stream code.]]> http://www.miikahweb.com/en/blender/git-logs/commit/2f61341bfcf348ce187c78795f8fdf156b7e28f6 2f61341
Branches : temp_viewport_fx_merge
Author : Antonis Ryakiotakis (psy-fi)
----------------------------------------
Move element indices to vertex stream code.

----------------------------------------
3 Paths Changed]]>
Wed, 18 Mar 2015 19:16:06 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/2f61341bfcf348ce187c78795f8fdf156b7e28f6Antonis Ryakiotakis