Blender Git Commits

code cleanup: color/bw conversion - use BLI color function.

change modifier to use the average of the RGB since perceptual conversion isn't really needed for modifiers.

Fix for recent changes in glsl

smooth seems to be a keyword in glsl and using it as a name for function property caused issues.

classic compile error: GLEW_STATIC needs to be define when we use opengl functions

Merging r46414 through r46455 from trunk into soc-2011-tomato

style cleanup: whitespace/operators

Fix #31349: Composite node is not found when part of a group.

Made smarter check for composite output node which now checks if there are
composite output nodes in group nodes.

Camera tracking: fixes for tracking of float images

- Fixed suddenly disappearing preview image from track widget
- Also suddenly stopping tracking should be fixed now

Both issues were caused by mixing working with floats and bytes and
in some cases it was wrong or missed checks done for this.

Update Eigen3 library, would be needed for some further integraiton.

copy constraints to object/bones had same name (made operator search confusing)

Fix #31369. Needed some do_versions backward compatibility code to ensure the old file path was split correctly into base path + filename.

Apply [#31335] COLLADA: fix for odd names for materials in exported dae files
Patch by Gaia Clary

This patch removes the index numbering from materials, which is not necessary.

fix [#31368] No masking drawn in Weightpaint-mode when displayed as wireframe

bgl new methods (for glsl shaders - #version 120)

** I did not update rst docs. I will post on the quick-hack list. If no one volunteers to do it, I have it done before next release. **

this patch add the barebone functions to do glsl shaders in an addon.
For simplicity sakes it supports old GLSL, but not all the new modern methods (glBindFragDataLocation, ...).

It should be enough to make an addon to help with bge 2d filters.
I'm using this with a 3dview callback and it's working nicely:
self._handle = context.region.callback_add(draw_callback_px, (self, context), 'POST_VIEW')

I was considering not to commit this patch due to it not covering all OpenGL new methods.
But frankly it's not the first time bgl is expanded upon individual needs (guilty of that myself).
If a python developer knows enough to use OpenGL and need new functions, s/he should also be able to patch Blender for that,
so I see no problems here.

Another solution is to move to PyOpenGL or similar any soon.

glShaderSource implemented differently than opengl standards. It's taking one source at a time (instead of an array of sources).
This is similar with PyOpenGL solution.

glActiveTexture
glAttachShader
glCompileShader
glCreateProgram
glCreateShader
glDeleteProgram
glDeleteShader
glDetachShader
glGetAttachedShaders
glGetProgramInfoLog
glGetProgramiv
glGetShaderInfoLog
glGetShaderiv
glGetShaderSource
glGetUniformLocation
glIsProgram
glIsShader
glLinkProgram
glShaderSource
glUniform1f
glUniform2f
glUniform3f
glUniform4f
glUniform1fv
glUniform2fv
glUniform3fv
glUniform4fv
glUniform1i
glUniform2i
glUniform3i
glUniform4i
glUniform1iv
glUniform2iv
glUniform3iv
glUniform4iv
glUniformMatrix2fv
glUniformMatrix3fv
glUniformMatrix4fv
glUniformMatrix2x3fv
glUniformMatrix3x2fv
glUniformMatrix2x4fv
glUniformMatrix4x2fv
glUniformMatrix3x4fv
glUniformMatrix4x3fv
glUseProgram
glValidateProgram

update stubs for blenderplayer

Cycles: fix issues with texture coordinates and object scale. Auto texture
space size and location were outdated often, and already computed on demand
by blender internal, now do that through RNA as well.

Enhance logging in libmv's trackers.
Cleanups in brute_region_tracker.cc.

Fix division by zero case in dualcon.

Code style cleanup in intern/dualcon.

Python/context: python could get invalid bpy.data in scene update handler after
undo.

The way this got updated from the context is a bit unreliable, and for handlers
the update couldn't happen because there is no context passed in. Now it's
updated from setup_app_data, which is where the change actually happens. I left
in the other updates to be sure but they should not be needed anymore.

style cleanup: graph & armature