Commit Graph

2176 Commits

Author SHA1 Message Date
b709b52f46 svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-24 13:21:54 +00:00
97d0846d2c svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-24 13:03:48 +00:00
4ab7c6ae1a 2.5 World Buttons:
* Exposure and Color Range buttons were missing, added them back.
2011-07-24 11:24:30 +00:00
cb2423e849 Add Push/Pull to toolbar 2011-07-24 00:59:03 +00:00
43994ce213 2.5:
* Removed some old not used code.
2011-07-23 22:08:37 +00:00
682cc63161 Merging with trunk up to r38631. 2011-07-23 16:34:30 +00:00
8cbd88aeef 2.5 UI:
* Added back icon to open the Splash Screen in the info header, next to version string info.
* Removed an unnecessary toggle argument for particle mode select buttons. The Toggle argument is only intended for booleans, not enums.
2011-07-23 15:36:51 +00:00
2a97e5a772 Merge with trunk r38619 2011-07-22 18:51:53 +00:00
Xiao Xiangquan
08645d9293 switch language in User Preference's System page. with some known switch failure bugs 2011-07-22 14:14:28 +00:00
0adad30e3f Bugfix [#27984] CTRL+T doesn't work in Video Sequencer properly
Time-scale drawing wasn't respecting the time unit setting.

While working on this, I tried to tweak the grid drawing to a more
common setting. It's hardcoded to show lines at every 25 px = once
every 25 frames, which is only really fine when FPS=25. Anyways, this
works fine enough for the sequencer for now in general usage.
2011-07-22 11:20:14 +00:00
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
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
4532bd731d Merge with trunk up to r38584. 2011-07-21 21:11:58 +00:00
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
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
57fe73b3ac View All/Selected tools for NLA Editor 2011-07-20 00:36:28 +00:00
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
7f74abeaca translated ndof menu from C to Python, enabled helicopter fly mode 2011-07-19 04:12:49 +00:00
52d12852e7 svn merge -r38157:38474 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-18 14:49:05 +00:00
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
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
f94c9d5d61 Fix python error in image sampling panel drawing when
there is no texture slot available.
2011-07-13 18:07:30 +00:00
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
fa78d3271f Bugfix: DopeSheet + Graph Editors were referring to wrong operator for
their "Duplicate Keys" menu entry
2011-07-13 12:02:39 +00:00
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
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
d9cf985730 Merging trunk up to r38329. 2011-07-12 13:09:22 +00:00
dbc9e36f72 make python3.3 compatible, __class__ is no longer in the class methods namespace. 2011-07-11 05:50:49 +00:00
301e5b4ea0 fix for various python bugs and remove unused var. 2011-07-10 17:26:15 +00:00
2420439773 Merge with trunk r38225 2011-07-08 11:16:13 +00:00
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
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
5817f1347c Remove unnecessary line from previous commit which slipped through 2011-07-07 04:47:47 +00:00
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
7858d9348e Merged 37865-38124 2011-07-06 13:49:47 +00:00
3f3c6f5f1f Merging from trunk up to r38119. 2011-07-05 13:54:25 +00:00
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
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
abb21a4da0 fix for python error when pinning a non mesh object in mesh editmode. 2011-07-03 07:21:33 +00:00
fdc59b8a40 Merge with trunk r38042 2011-07-02 18:15:55 +00:00
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
2c66ab12e9 minor pep8 edits 2011-07-01 12:33:34 +00:00
8d4ea1b155 Tweak to the toggle to show/hide datablock filtering items in
animedit headers
2011-06-30 01:13:15 +00:00