Commit Graph

49420 Commits

Author SHA1 Message Date
Sergey Sharybin
4e9381bc35 Fixed for navmesh on FreeBSD. Oatch by sambler, thanks! 2011-09-10 14:55:14 +00:00
Sergey Sharybin
782a7a3677 Change priority for editor util library. Gave linking errors here. 2011-09-10 14:28:34 +00:00
Sergey Sharybin
bdd4aa27b0 Another set of fixes for recats: osx uses different order of arguments for sort_r
and it's callback.

Also do not use char constants like 'NAVM' which is casting to int.
And added defautl section to switch in KX_NavMeshObject::DrawNavMesh.
2011-09-10 14:12:15 +00:00
Tamito Kajiyama
353713afe8 Merged changes in the trunk up to revision 40096.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt

Note for branch builders: Enabling Blender Player may cause linker errors.
2011-09-10 13:36:27 +00:00
Campbell Barton
322dbc9a0f use vertex arrays for wireframe octahedral bone drawing. 2011-09-10 12:07:16 +00:00
Campbell Barton
357febc168 fix for building with collada and some other warnings 2011-09-10 09:38:38 +00:00
Thomas Dinges
8ed1c07a7b Navigation Mesh Modifier:
* Fix scons define for operator append
* Don't use abbreviations in the UI.
2011-09-10 09:21:46 +00:00
Thomas Dinges
571f7db529 MSVC build fix by MiikaH for NAVMESH. Thanks! :) 2011-09-10 09:06:42 +00:00
Miika Hamalainen
9de082dbf4 Dynamic Paint:
* Enabled modifier "Apply" button since it can now be used to apply displacement or output layers to the mesh.
* Default surface output names are now unique in case canvas has multiple surfaces of same type.
* Merged "face aligned" and "non-closed" brush options to a single "Project" toggle, available for "Proximity" brushes.
* Added more icons to user interface selections.
* Increased default proximity distance.
* Set proximity falloff ramp to only affect alpha by default.
* Removed some no longer required render ext. functions.
* Fix: geometry node vertex alpha didn't work unless "Vertex Color Paint/Light" was enabled from material.
2011-09-10 08:55:44 +00:00
Thomas Dinges
e86bda9a5b Compile fix for scons:
* Don't compile with navmesh_conversion.cpp if Game engine is disabled.
2011-09-10 08:25:03 +00:00
Bastien Montagne
21f4ef77c0 Fixing bugs after Recast & Detour branch merge
*The eModifierType_NavMesh enum define was added before WeightVG ones, in ModifierType, breaking file load for WeightVG modifier. New modifier should always be added at the end of that enum!
2011-09-10 07:58:42 +00:00
Thomas Dinges
1334d3cb45 NAVMESH Modifier was not alphabetical correct in the modifier list, as the others. 2011-09-10 07:14:35 +00:00
Campbell Barton
01dca44a84 disable navmesh feature when building without the game engine. 2011-09-10 04:21:58 +00:00
Campbell Barton
fb4abf2e41 fixed linking with CMake 2011-09-10 03:42:45 +00:00
Campbell Barton
0128218254 recast and detour patch now builds again with GCC
- rearrange structs to work for 64bit
- define all vars before goto's
- ifdefs for qsort_r/qsort_s
- dont cast pointers to int only for NULL checks
- dont printf STR_String directly, get the char pointer from it

also minor change to gpu py module, no need to pass empty tuple to PyObject_CallObject, can just be NULL
2011-09-10 03:07:26 +00:00
Campbell Barton
23b843130b fix own mistake in recent commit, was using glIndexPointer incorrectly. 2011-09-10 01:39:21 +00:00
Guillermo S. Romero
a7f3e347b7 SVN maintenance. 2011-09-09 22:02:12 +00:00
Benoit Bolsee
5d4a5b47a0 BGE: merge Recast & Detour branch (sock-2010-nicks).
Add navigation mesh capability to the BGE, both by logic bricks and python.
Add tools to creation navigation mesh in the creator:
- manualy
- automatically from existing mesh with "object.create_navmesh" operator
- automatically from existing mesh with "Navigation mesh" modifier
Editing navigation mesh is possible via special modifier edit mode.
Creation and modification of Navigation mesh is also possible at runtime in the BGE.

Documentation at http://wiki.blender.org/index.php/User:Nicks/Gsoc2010/Docs

Warning: No upgrade is provided for blend files created under the branch.
         If you load a blend with navigation data created with a branch
         build, it will likely crash blender or behave incorrectly.
2011-09-09 21:28:56 +00:00
Benoit Bolsee
673552502b svn merge -r 40061:40078 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-09 19:30:33 +00:00
Campbell Barton
ceb9b237f2 svn merge -r40051:40075 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-09 15:25:15 +00:00
Campbell Barton
e7730758e2 patch [#28588] BMesh: "Split" tool
from Andrew Wiggin (ender79)

Impliments the split tool in bmesh.
2011-09-09 14:58:49 +00:00
Campbell Barton
3f91c0ab5d correct edit some comments 2011-09-09 14:51:30 +00:00
Campbell Barton
4b1a8d62e1 use opengl vertex arrays for the base widgets, their rounded corners, arrows and emboss. (note, this is from OpenGL 1.1 from 1992, nothing fancy), gives moderate speedup on my system when showing many buttons (10% - 15%). 2011-09-09 14:44:36 +00:00
Sergey Sharybin
657fa2494f [#28595] Select similar edges by face angles ignores z component of normal angles
Patch provided by Andrew Wiggin (ender79). Thanks!
2011-09-09 14:04:33 +00:00
Campbell Barton
5fc9baa962 warning fixes 2011-09-09 13:46:47 +00:00
Sergey Sharybin
8c1b4f8e05 Fix #28590: Sculpt Overlay Texture in Viewport Glitched and Wrong icon for Overlay Option?
Use clamp to border for fixed textures.
2011-09-09 13:42:22 +00:00
Campbell Barton
a3ac15db3d error (case insensitive search replace) 2011-09-09 13:37:17 +00:00
Campbell Barton
40481af180 replace magic numbers with defines to make the interface source more readable.
only functional change is the uiWidgetBase struct stored up to 64 verts, changed this to 36 since thats the most that is used atm, added assert if this ever changes.
2011-09-09 13:10:18 +00:00
Joshua Leung
8af4b90f07 Hotkey tweaks: Start/End frame jumping back to Shift-Left/Right
I'd moved them to Ctrl-Shift-Left/Right having thought that they were
for some reason now conflicting with some other hotkeys. Apparently
not.
2011-09-09 13:02:15 +00:00
Joshua Leung
67ea3180d9 Patch [#23443] Change outliner filter into search
Shane Ambler (sambler) for this 12-month vintage!

From description:
One thing with the outliner filter box is it only filters items that
are currently visible. To find what you want you need to manually
expand a few levels so that what you want to find is visible.

This small patch expands items when filtering is done - effectively
turning it into a search.

Currently this does not alter the datablocks view as expanding all
entries takes waaaay tooooo long.
I prevent the expansion of RNA entries for userprefs which prevents
infinite recursion but the datablocks list is just too big for this
approach. I think it would need a custom outliner_build_tree for a
full search.
2011-09-09 12:46:07 +00:00
Benoit Bolsee
ca170a8ed6 forgot to resolve one conflict in previous merge 2011-09-09 12:37:56 +00:00
Nathan Letwory
bef9509565 Apply small patch by Shane Ambler:
* inline of math funcs for Apple PPC
* eltopo big/little endian ifdef
2011-09-09 12:23:45 +00:00
Benoit Bolsee
c1c4743696 svn merge -r 39975:40061 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-09 12:21:41 +00:00
Benoit Bolsee
01744abd81 GPU: add gpu python module with export_shader() function to export GLSL shader.
shader = gpu.export_shader(scene,material) 

Returns the GLSL shader that blender generates to produce the visual effect
of material in scene for the purpose of reusing the shader in an external engine.
This function is meant to be used in a material exporter so that the GLSL
shader can be exported entirely. The return value is a dictionary containing the
shader source code and all associated data. 

The full documentation is under sphinx.

Warning: there has been an API between the patch and this commit:
uniform['lamp'] and uniform['image'] now return python reference to 
ID block instead of ID name as before. The X3D exporter that uses this
function must be adapted.
2011-09-09 11:55:38 +00:00
Campbell Barton
2b33c6b0b2 workaround for msvc not supporting variable length args in macros. 2011-09-09 11:54:13 +00:00
Brecht Van Lommel
fe48e008e5 Fix #28392: some selection operators were working in linked scenes, others not.
This allows all object selection operators now, useful for inspecting the scene.
2011-09-09 10:15:14 +00:00
Campbell Barton
9ff0b732a2 fix [#28534] Rotate Edge Vertices selection mode.
de-select other verts when rotating an edge, providing the initial edge was not between 2 selected faces.
2011-09-09 04:09:34 +00:00
Campbell Barton
7b637dc167 auto-merge was loosing the selection after running remove doubles, this is quite annoying.
added BM_MergeHFlag() inline function to OR flags together, run this on both verts before merging.

also removed not-helpful comments.
2011-09-09 03:34:48 +00:00
Campbell Barton
fa59b80189 move smallhash into its own C file, was inlineing fairly large functions. 2011-09-09 02:52:20 +00:00
Campbell Barton
38b2618319 svn merge -r40034:40051 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-09 02:29:44 +00:00
Campbell Barton
0727893231 remove mesh and object arguments from bmesh operators, these are stored within the BMesh its self. 2011-09-09 02:21:57 +00:00
Campbell Barton
a59ba9a519 - turn RNA_warning into a macro which includes the function name (was being written in manually but had incorrect func names in places).
- add __func__ define to BLI_utildefines.h for MSVC.
2011-09-09 01:29:53 +00:00
Guillermo S. Romero
ae7401751c SVN maintenance. 2011-09-09 00:46:00 +00:00
Brecht Van Lommel
ff0a452a8a Fix #28310: import of key configuration with modal keymap not working. 2011-09-08 13:22:26 +00:00
Brecht Van Lommel
41703b851d Modifiers: put uv project and vertex weight modifiers in separate category,
couldn't really think of a good name for it, suggestions welcome.
2011-09-08 12:53:01 +00:00
Campbell Barton
d841067c35 patch [#28554] BMesh: fix for 28553
from Andrew Wiggin (ender79)
2011-09-08 10:06:28 +00:00
Sergey Sharybin
279d64def7 Fix #28545: User Preferences - System Tab - Reset All To Default Values on OpenGL Lights
Added default direction to light.
2011-09-08 09:46:31 +00:00
Campbell Barton
61b6fcd804 svn merge -r39991:40034 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-08 08:29:49 +00:00
Campbell Barton
e7f21e58de edits to new modifiers to work with bmesh 2011-09-08 08:18:46 +00:00
Campbell Barton
24c9369477 svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-08 08:08:31 +00:00