Commit Graph

3240 Commits

Author SHA1 Message Date
42b87af8a7 svn merge -r38600:38700 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-26 04:31:59 +00:00
fc95382a97 svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-26 03:55:23 +00:00
cadfac5a0f svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-25 17:51:30 +00:00
cc0abf9963 svn merge -r37900:38000 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-25 16:12:54 +00:00
2dc6b8f835 svn merge -r37700:37800 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-25 14:34:36 +00:00
a7815053ef svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender
manually merged source/blender/editors/uvedit/uvedit_unwrap_ops.c
2011-07-25 12:59:54 +00:00
e31fef1d94 set default values for all other ndof flags 2011-07-25 00:10:42 +00:00
46db54c805 Merged changes in the trunk up to revision 38663. 2011-07-24 23:42:20 +00:00
35720a4c07 Merge with trunk r38663 2011-07-24 18:01:20 +00:00
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
b401d09d8f * Minor code cleanup / comment changing. No functional changes. 2011-07-24 11:11:23 +00:00
Nathan Letwory
6149526aac Default for ndof_sensitivity to 1.0 in case 0.0 is found on start. 2011-07-24 08:50:09 +00:00
2a97e5a772 Merge with trunk r38619 2011-07-22 18:51:53 +00:00
cbe1613c01 Dynamic Paint:
* Surface bake data is no longer recalculated every frame, but only when surface mesh has moved/transformed. Results in multiple times better performance on high resolution surfaces when using sub-steps or surface is still.
* Heavily optimized particle brushes when random particle size enabled. Up to 10x speedup with large radius particles.
* Added an additional "grid" space partitioning structure for surfaces.
* Added bounding box checks for brushes.
* Smaller overall optimization.
* Further OpenMP parallelization.
* Added physics tab link to modifier panel.
* Fix: "Point Density" texture cache wasn't properly updated. Brushes can now use Point Density textures as well.
* Fix: Paint dissolve resulted in black color.
* Fix: KD-tree checkups weren't completely thread safe. Fixes possible crash with OpenMP enabled particle brushes.
* Fix: When brush was set to use a specific material, it was saved incorrectly and resulted in potential crashes on next load.
2011-07-22 18:37:30 +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
4532bd731d Merge with trunk up to r38584. 2011-07-21 21:11:58 +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
5792bd7cc7 cmake: cleanup include paths, some duplicates and going up some unneeded dirs. 2011-07-17 09:11:13 +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
Xiao Xiangquan
470a5017fb complete space outliner, space node, space nla, etc. 2011-07-13 14:41:12 +00:00
77faef7b5f Dynamic Paint:
* Proximity brush color ramp should now work properly with any type of proximity brush.
* Dynamic Paint operators (adding surfaces, baking, etc.) now affect right object even when ui is pinned to a non-selected object.
* Fixed proximity falloff for vertex weight surfaces.
* Fixed possible color issue with low alpha brushes.
* Fixed a compiler warning.
2011-07-10 16:08:26 +00:00
2420439773 Merge with trunk r38225 2011-07-08 11:16:13 +00:00
c57ac39f7f Merging trunk up to r38193. 2011-07-07 16:34:19 +00:00
4d7449b336 Fix part of #26811: absolute shape keys should not show influence value in list. 2011-07-07 11:01:36 +00:00
3f3c6f5f1f Merging from trunk up to r38119. 2011-07-05 13:54:25 +00:00
ca2c319649 Fix #27850: keyboards with a comma instead of a dot on the numpad now get
converted to a dot when typing into number buttons, for easier number entry.
2011-07-04 10:56:59 +00:00
de1c4fafc7 First stages of easier "expressions" creation...
It is now possible to create "scripted expression" drivers by simply
clicking on some property, and typing some short Python expression
prefixed with a '#'. This will result in a scripted expression driver,
with the typed-in text being created.

For example, you can click on X-Location of the default cube, and
type:
#sin(frame)
and a new driver will be created for the x-location of the cube. This
will use the current frame value, and modulate this with a sine wave.

Do note though, that the current frame is a special case here. In the
current implementation, a special "frame" driver variable, which
references the current scene frame is created automatically, so that
this simple and (assumed) common case will work straight out of the
box.

Future improvements:
- Explore possibilities of semi-automated extraction of variables from
such expressions, resulting in automated variable extraction. (Doing
away with variables completely is definitely 100% off the agenda
though)
- Look into some ways of defining some shorthands for referencing
local data (possibly related to variable extraction?)
2011-07-04 03:12:28 +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
613e9b9926 changed the max decimal points to show from 7 to 6, since with float precision problems the median point of a selection could be 0.0000003 2011-07-03 13:20:21 +00:00
fdc59b8a40 Merge with trunk r38042 2011-07-02 18:15:55 +00:00
Xiao Xiangquan
9b8538c69c 3D view, graph editor, etc. done 2011-07-02 03:17:09 +00:00
3eec91f4d7 Keying Set UI - Icons for Paths in List
The Keying Set paths list now shows the icon of the type of ID-block
that a path item refers to. This make it easier to make snese of the
paths shown in the list.
2011-07-01 03:35:59 +00:00
06fcf2e6ef Todo item:
Closed regions didn't always draw the (+) icon right place, confusing
for users.

Next to that, I think this icon is using a bad metaphor or visual language,
Illustrated best if you close a header in outliner or buttons. Icons are
UI widgets, for screen/editor layouts different controls can be stylized.

My preference is something that aligns visually to the seperators between
regions; for testing and hacking pleasure I've added two quick versions,
a small tabbish thing and a triangle. Enable these with debug menu,
ALT+CTRL+D, values 1 or 2.

This is simply drawn with opengl now. An image for it can be made as well.

Previews:
http://www.blender.org/bf/closed_regions1.png
http://www.blender.org/bf/closed_regions2.png
http://www.blender.org/bf/closed_regions3.png

There's other design ideas to explore as well, like making region deviders
8-10 pixels wide, with a 'drag me' dot on it or so. That takes some screen
estate though, and will require to add big editor-dividers too...
Fun stuff for the mockup-mafia to check on, we have time :)
2011-06-30 15:02:03 +00:00
2a85eff40c Bugfixes:
* After changing driver target settings, the driver F-Curves now have
their "disabled" flags cleared, so that they will be updated
immediately instead of needing a manual "Update Dependencies" flush
* Little comment tweak to appease my text editor
2011-06-30 04:38:27 +00:00
2f60a5030f Actions can now be made single-user from the Outliner
* Use the same method as from unlinking actions to do this.
* Split off the make single-user code used for the ID-browser into a
function in blenkernel which can be used elsewhere. Getting materials
to also work using this method proved to be a bit too tricky (due to
the whole messy ob vs obdata situation), so I haven't done that.
2011-06-29 04:34:20 +00:00
d18d37d25f Cycles: svn merge -r37694:37904 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-06-28 15:00:42 +00:00
1cf0af703d Cycles: working towards texture workflow design
http://wiki.blender.org/index.php/Dev:2.5/Source/Render/TextureWorkflow

* Added "active texture node" in shading node trees.
* Texture draw mode draw active texture node now, and new Material draw
  mode shows GLSL material.
* GLSL materials now match solid draw mode lighting better.
* Texture properties can now texture nodes from material/world/lamp.
2011-06-27 17:10:50 +00:00
c896fcae79 Merge with trunk r37849 2011-06-27 08:11:05 +00:00
d65ebf8c84 Merged changes in the trunk up to revision 37799.
Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies.  Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.
2011-06-25 00:49:53 +00:00
05fb0e2d61 First commit to make "Style" settings saved in startup.blend
Usage currently is limited to:
- Panel text, widget text and label text style:
  point size, shadow effects

Setting individual fonts to these is not possible yet, it uses the
default for it.

Access goes via outliner now; check "User Preferences". UI team could
add this in userpref scripts :)
2011-06-24 14:00:15 +00:00
Xiao Xiangquan
79c129647e right panel done 2011-06-24 04:22:27 +00:00
Xiao Xiangquan
b429af10d0 merge from trunk #37722 2011-06-24 03:30:50 +00:00
07dee0d8a6 Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk 2011-06-21 15:47:18 +00:00
207911bdb3 Merge with trunk r37677 2011-06-20 22:55:18 +00:00
Xiao Xiangquan
9a2f36b50f handle SpaceType and UserPref popups 2011-06-20 10:07:46 +00:00
1283b07409 use ascii drawing function where utf8 isnt needed. 2011-06-18 09:01:26 +00:00
68a12c74b6 fix [#26621] Memory leaks when creating popup window.
also fixes memory leak when cancelling a popup dialog (new image for example).
2011-06-17 12:48:33 +00:00
dce577ad85 use directory selector for properties defined as PROP_DIRPATH, user preferences 'File' buttons for eg. 2011-06-16 15:28:39 +00:00