Commit Graph

2516 Commits

Author SHA1 Message Date
Nathan Letwory 7b1bb26135 Show NDOF sensitivity field in userprefs 2011-07-21 22:26:58 +00:00
Nathan Letwory 32004f11aa Keymap editor now understands NDOF (button) events too. 2011-07-21 21:43:42 +00:00
Daniel Salazar 2c798fd86d Adding Shear transform to UV menu and Ctrl Alt Shift S hotkey (same as in 3D View) 2011-07-21 21:34:08 +00:00
Joerg Mueller 4532bd731d Merge with trunk up to r38584. 2011-07-21 21:11:58 +00:00
Jason Hays 05c6d22af1 Merged from trunk 38474-38568 2011-07-21 16:51:36 +00:00
Nathan Letwory eea7c358c7 svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-21 09:40:59 +00:00
Tamito Kajiyama ce03ec4b86 Merged changes in the trunk up to revision 38543.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
2011-07-20 23:33:10 +00:00
Joshua Leung 57fe73b3ac View All/Selected tools for NLA Editor 2011-07-20 00:36:28 +00:00
Jeroen Bakker 4024b14b43 fix for [#28012] Mat ID messy with shader nodes
Issue was that the Shader tree execution changed the ShaderInput.
Changes are that the UI is updated that only the main material will have the pass_index this is displayed in the "render pipeline options" panel.
When the material is not a node material the pass_index will be shown at the "options" panel

To test enable nodes on the material
Add a new input material
change the pass_index of the material (render pipeline options)
Enable RenderPass material ID and use the compositor to read out the material pass

Jeroen
2011-07-19 08:31:53 +00:00
Mike Erwin 7f74abeaca translated ndof menu from C to Python, enabled helicopter fly mode 2011-07-19 04:12:49 +00:00
Campbell Barton 52d12852e7 svn merge -r38157:38474 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-18 14:49:05 +00:00
Campbell Barton b8fc3030b5 svn merge -r37793:37865 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Merge info was  /trunk/blender:36835-37793,37865-38157
so this should merge in missing files.
2011-07-18 14:15:02 +00:00
Campbell Barton 8dd72c476e fix [#28005] Python Add-Ons are constantly reloaded if twice in the path
Addons are checked for their timestamps and reloaded when it changes but this failed when, 2 addons had the same name since different times caused 2 reloads on every redraw.

Now when duplicate addons are in the path now give a error message in the UI and print path conflict in the console and don't thrash reloading.
2011-07-18 05:41:46 +00:00
Xiao Xiangquan 77926a7f9d select uiStyle according to UserDef and update lang-packs 2011-07-16 18:28:24 +00:00
Xiao Xiangquan fa46278e34 merge from trunk 38379 2011-07-14 17:29:53 +00:00
Brecht Van Lommel f94c9d5d61 Fix python error in image sampling panel drawing when
there is no texture slot available.
2011-07-13 18:07:30 +00:00
Brecht Van Lommel 74536efa91 Fix #26704: activating a texture node inside material nodes did not show that
texture in the texture properties.
2011-07-13 17:52:23 +00:00
Xiao Xiangquan 470a5017fb complete space outliner, space node, space nla, etc. 2011-07-13 14:41:12 +00:00
Joshua Leung fa78d3271f Bugfix: DopeSheet + Graph Editors were referring to wrong operator for
their "Duplicate Keys" menu entry
2011-07-13 12:02:39 +00:00
Jason Hays 9a808e7b8c Lots of incomplete changes:
Weight Paint Vertex Select tweaked to act like edit mode's select and Circle select was added, but clipping is not working properly for either.

Select all was added too, but to the Q key until I look into overriding A's select all bones.

The select vertices checkbox was moved to the header, but it does not force face select mask to turn off yet--and it doesn't have the correct icon.

There will definitely be an update tomorrow to fix the problems with all or most of the issues.
2011-07-12 19:06:06 +00:00
Jeroen Bakker b724c7f27e Add delete with reconnect feature.
this will reconnect nodes as if the deleted node is muted.
Operation is added to the space_node node menu and to the keymap as CTRL-X

to test this just add some nodes to the space_node
select one or multiple nodes and press CTRL-X

It should reconnect the nodes as they were muted

limitations:
1. it performs a delete and reconnect per node. It does not evaluate all selected nodes as one whole
2. mute only supports Value, Vector and Color data types, so does this feature
3. not usable for nodes where input and output does not match (like colorToBW)

Where reconnect could not be preformed the links will be removed from the model.

Undo works with this delete with reconnect.
2011-07-12 18:59:54 +00:00
Joerg Mueller d9cf985730 Merging trunk up to r38329. 2011-07-12 13:09:22 +00:00
Campbell Barton dbc9e36f72 make python3.3 compatible, __class__ is no longer in the class methods namespace. 2011-07-11 05:50:49 +00:00
Campbell Barton 301e5b4ea0 fix for various python bugs and remove unused var. 2011-07-10 17:26:15 +00:00
Miika Hamalainen 2420439773 Merge with trunk r38225 2011-07-08 11:16:13 +00:00
Miika Hamalainen f8f1cbd17f Dynamic Paint:
* Canvas and brush can be now enabled simultaneously. This way it's possible for two canvases to interact.
* Added basic anti-aliasing support for vertex surfaces.
* 3D-view color preview now works even when there's subsurf modifier after Dynamic Paint in modifier stack.
* Added a new brush option to use proximity from object center.
* Default surface frame range now use scene's start and end values.
* Improved ray checks for volume brushes.
* Added new "non-closed" option for volume brushes. This way it's possible to use planar meshes as "volume" brushes with predefined ray direction.
* New carrot branch splash image by CGEffex.
* Improved brush affection code.
* Lots of smaller improvements.
* Fixed: Weight paint didn't work with particles.
* Fixed: Point cache didn't work for non-wave surfaces anymore since last commit.
2011-07-08 11:03:37 +00:00
Xiao Xiangquan b4c02ee722 finish user preference dlg's input handles 2011-07-08 04:32:45 +00:00
Jason Hays 4f8b9a4033 Removed code I no longer needed for multi-paint's newer system.
Added comments to the more complex functions.
2011-07-07 17:59:15 +00:00
Joshua Leung 5817f1347c Remove unnecessary line from previous commit which slipped through 2011-07-07 04:47:47 +00:00
Joshua Leung cff7c61ddb Patch [#23682] Add sort+move to bone group list in panel
Thanks  Torsten Rupp (rupp)   for the patch!

This patch adds the abilities to sort the bone group list in the
properties panel and to move bone groups up/down in the list (similar
like for vertex groups)
2011-07-07 04:31:53 +00:00
Jason Hays 7858d9348e Merged 37865-38124 2011-07-06 13:49:47 +00:00
Joerg Mueller 3f3c6f5f1f Merging from trunk up to r38119. 2011-07-05 13:54:25 +00:00
Jeroen Bakker c4491f558b Current situation
A mesh can consist out of multiple material. Take a character with clothing's. the skin can be a different material as the different clothing's. During compositing it is a common use-case to only do a part of the composit on only a specific material. Currently this can not be done.

In blender movies this feature is known to be implemented, but until now it never got integrated into trunk.
Proposal

With material index the Blender internal renderer will be capable of creating a buffer containing the material indexes of the first pixel-hit. This will be implemented in the same manner as the object index.

In the compositor the ID Mask node can be used to extract the information out of the Render pass.
Impact
User interface

On the properties-space the next changes will be done

    Scene⇒Render layer⇒Passes⇒Material index will be added
    Material⇒Options⇒Pass index will be added

DNA

    Material struct will get an new field called “index”. this will be a short-type.
    Material struct the field pad will be removed.
    A new Render-layer pass will be added (bit 1«18)

RNA

    Material RNA is updated (based on “pass index” from object)
    Render layer RNA is updated (based on IndexOB)

Blender internal renderer

The Blender internal renderer will process the render pass as a copy of the Object index.
Blender compositor

The render layer input will get a new output socket called “IndexMA”
Usage

An example on how to use material index can be found at:

https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests/compositing/composite_materialindex.blend

This is also example of a commit message longer than the commit itself :)
2011-07-04 18:14:41 +00:00
Miika Hamalainen 901f24716b Dynamic Paint:
* Some ui and rna tweaking.
* Effects ui panel is no longer visible for non-paint surfaces.
2011-07-03 14:01:57 +00:00
Campbell Barton abb21a4da0 fix for python error when pinning a non mesh object in mesh editmode. 2011-07-03 07:21:33 +00:00
Miika Hamalainen fdc59b8a40 Merge with trunk r38042 2011-07-02 18:15:55 +00:00
Miika Hamalainen 9ae663154f * Added a new surface type "Waves" that simulates simple 2D wave motion.
* Optimized adjacency point searching for vertex surfaces.
* Separated adjacency code from effect system.
* Overall code cleaning and tweaking.
2011-07-02 18:06:39 +00:00
Xiao Xiangquan 9b8538c69c 3D view, graph editor, etc. done 2011-07-02 03:17:09 +00:00
Campbell Barton 2c66ab12e9 minor pep8 edits 2011-07-01 12:33:34 +00:00
Joshua Leung 8d4ea1b155 Tweak to the toggle to show/hide datablock filtering items in
animedit headers
2011-06-30 01:13:15 +00:00
Campbell Barton 7f70f78376 Addon UI: button for removing addons which are installed to user/home paths, this is not displayed for system addons, or ones which come with blender. 2011-06-29 15:56:22 +00:00
Joshua Leung 2710c567b9 Animation Editors - Small Visual Tweaks for Usability
== Datablock filters in the headers are now hidden by default ==
This has been done because users were generally not frequently
toggling these, so quick access vs screen-estate cost wasn't really
worth it to have these always showing and taking up space on the
header.

Usage notes:
- To show these again, click on the "Filter more..." toggle.
- The "Filter more..." button DOES NOT affect whether those filters
apply.

Design notes:
- I tried many other button/icon combinations, but those were either
too space-hogging, vague, or had wrong button order.
- I also tried putting a box around these, but there was too much
padding.
- The ordering of the filters has also been modified a bit so that the
group/fcurve-name filters occur earlier in the list, given that
they're used more frequently

== Graph Editor - Use Fancy Drawing ==
Renamed this option to "Use High Quality Drawing" as suggested by
Matt. "Fancy" isn't really descriptive enough.

== Icons for Mode Dropdowns ==
The mode dropdowns in the DopeSheet and Graph Editors now have icons.
- These were important enough (compared to the auto-snap mode) that
some visual decoration was perhaps warranted.
- It makes it easier to see at a glance what mode the view is in

Icon choices:
- In some cases, the icons seem like quite a natural fit IMO (i.e.
outliner<->dopesheet, key<->shapekey editor, grease pencil, fcurve
editor)
- Action Editor uses an "object" icon to indicate that this is object-
level only for now (though I hope to find a way to address this
soon/later). This will be kept like this until then.
- There isn't any icon for drivers, so after trying a few
alternatives, I settled on area-link icon, since it ties together two
entities using some link.
2011-06-29 13:00:19 +00:00
Campbell Barton 57f4844c43 make drawing faces in the UV editor an image space option, re-using the mesh option was lazy and doesn't make much sense. 2011-06-28 09:42:17 +00:00
Jason Hays 84ea89e25f Merged from trunk with revision range 36835-37865,
(No conflicts had to be manually resolved)
Gave weight paint a basic ability to draw edges and vertices with an option
 (with colors for selected/unselected),
but I didn't make any vertex selection functions available in weight paint mode yet
(tested with edit mode for now).
2011-06-27 17:21:08 +00:00
Campbell Barton 4dd18f7e6f fix for editmode option toggle 2011-06-27 11:40:15 +00:00
Miika Hamalainen c896fcae79 Merge with trunk r37849 2011-06-27 08:11:05 +00:00
Campbell Barton a1abdf1c1c fix [#27778] Set Bone Flags - No Scale - Toggle seems not to work.
Toggling options on the selection is better done as a generic operator.
Replace ARMATURE_OT_flags_set and POSE_OT_flags_set with WM_OT_context_collection_boolean_set and use menus to access it with specific settings.

This way its easy make a key shortcut which toggles any boolean on any collection - sequences, metaballs, objects, bones etc.
2011-06-27 07:51:52 +00:00
Miika Hamalainen cb12648656 Dynamic Paint:
* Fixed memory leak when baking image sequences.
* Fixed sub-steps when brush was controlled by a parent object.
* Added option to select active outputs for paint surfaces.
* Improved color mixing algorithm.
* Improved memory allocation behavior.
* Memory is now freed even in case of errors.
* Removed "initial color" setting, as it's better to adjust color from material.

* "Paint effects" system:
** Converted to use new data structures.
** Works now with any number of surrounding points.
** Re-implemented support for UV-image surfaces.
** Added support for vertex surfaces too.
** Improved color handling.
** Improved movement stability.
** "Drip" effect uses now Blender's force fields instead of just z-directional gravity like before. Now each surface point can have different force influence.
2011-06-27 07:30:58 +00:00
Campbell Barton 33e554799b Minor warning cleanup & fix
- comment/remove assignments from values to themselves.
- add case break statements (no functional change but some source code checkers notice).
- fix python errors when the sculpt brush is None.
2011-06-27 03:36:14 +00:00
Geoffrey Bantle 102c228ef8 Brought back select by number of vertices
and select loose verts/edges:
----------------------------------------------
Split select by number of vertices and select
loose verts/edges into seperate functions.

Previously select by number of vertices was
also accessed through two different UI items,
"Select Quads" and "Select Triangles". Now
it is one function with a integer property
for selecting the size of the face you want
selected.

Also added an option to modify the behavior
of the selection. Can now select whether you
want to select faces that have vertices
equal to, less than or greater than the number
of vertices in operator property.
2011-06-26 20:23:27 +00:00