Blender Git Loki

Forgot to define WITH_COLLADA in SCons in recent commit

Also fix some issues with header files:
- Added ifndef .. define .. endif blocks to be sure headers are not
including twice.
- DO not include WM stuff in headers, use anonymous structure names instead.

Fix compilation error for SCons

Was missed some scons rules after recent collada changes

SVN maintenance.

Collada: fix for building without collada

Collada: fix case of filename

Collada: fixed contributor line in CMakeLists.txt

Collada: Moved interface definitions from wm_operators.c to blender/editors/io

svn merge ^/trunk/blender -r48004:48011

Collada: (Exporter) reorganized the export panel

Now updating of resolution should happen nice when clip's filepath is changing

== filebrowser ==
fixes:
* Sequence editor not loading file typed in filebrowser file button (reported by Sergey on IRC)
* filename button doesn't match exactly typed in filename

notes:
* file specified in the filename button now gets added to 'files' list, even if not selected
* after matching filename (either by typing in exact match or using wildcards) the first match is assigned to the filename button.

style cleanup: also quiet a warning.

style cleanup:
also fix for building ghost test and fix double free in one of the tests

Fix for [#31848] "BGE: Commit r47628 breaks custom GLSL material shaders" reported by Alex Fraser.

Custom shaders is a case where the BGE can be using GLSL materials and still need to upload textures without bf_gpu. I tweaked some logic to handle this special case and added more comments.

svn merge ^/trunk/blender -r47023:HEAD

Collada: (Exporter) add 'mesh type selection(view|render)' for Apply modifiers option

Fix for persistent failures of BLI_assert(CustomData_has_layer(&dm->faceData, CD_POLYINDEX));
in CDDM_calc_normals_mapping_ex() in source/blender/blenkernel/intern/cdderivedmesh.c.
Problem report by flokkievids with an example .blend file for reproducing the issue. Thanks!

The issue was caused by the fact that Freestyle was using the pre-BMesh way for constructing
mesh data with the aim of generating a temporary 3D scene for stroke rendering. Specifically,
the MFace struct was used for defining triangular faces. Now BMesh is in the trunk, MFace
is internally used for tessellated faces only, and MPoly and MLoop are used for general mesh
data construction. This commit is intended to update the Freestyle stroke rendering code in
the BMesh way.

Fixed a typo.

Fix for NaN's in the Z component of projected points by SilhouetteGeomEngine::ProjectSilhouette().
This issue arises when the Z depth of the bounding box of the scene being rendered is zero.

code cleanup: includes, also correct some py example typos