Commit Graph

7971 Commits

Author SHA1 Message Date
Matt Ebb
34dc95f7ee svn merge -r 22423:22450 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender 2009-08-15 07:40:22 +00:00
Nicholas Bishop
c6e041f125 2.5/Paint modes:
* Moved brush curve preset operator out of sculpt to paint_utils
* Added a button to the curve panel to set the preset
2009-08-14 04:45:29 +00:00
Thomas Dinges
ec00cec3e8 2.5 Timeline:
* Added some menus and buttons. Still uncommented.
2009-08-13 22:10:50 +00:00
Nicholas Bishop
972224b9e1 2.5/Sculpt:
* Moved the brush texture settings to MTex/TextureSlot. The mapping settings now show up in the texture panel, pretty much like they do for textures used with materials.

TODO:
* Tiled mode should not show Z size setting
* Add a locked mode so that texture size can be changed uniformly like in 2.4x
2009-08-13 20:05:36 +00:00
Thomas Dinges
e8d9e0823e 2.5 Timeline:
WIP Commit, still uncommented.
* Adeed some RNA properties for Playback.
* Start of Python File.
2009-08-13 16:59:52 +00:00
Daniel Genrich
94d359c9bc Some changes to smoke ui (path by nudelZ) - this divides the panel in normal and advanced options 2009-08-13 14:27:35 +00:00
Arystanbek Dyussenov
44ddff5c51 - 3ds importer working (without the "scale to size" option)
- changing object.matrix now updates object.loc/rot/scale
- added bpy.data.add_lamp()
2009-08-13 11:14:06 +00:00
William Reynish
5a3bd23e8e Accidentally made the game collision bounds panel display itself when Blender Render was selected as the renderer. 2009-08-13 09:30:36 +00:00
Campbell Barton
d916c25616 - moved unit settings from user prefs into the scene.
- use the scene context for the unit settings since there isn't a better place for it currently.
- added 'chain' to imperial units
- set more rna props to be distances and angles.
2009-08-13 07:37:41 +00:00
Matt Ebb
5a21bc578c * First commit merging 2.4-based sim_physics in to volume25 branch.
Integration is still very rough around the edges and WIP, but it works, and can render smoke (using new Smoke format in Voxel Data texture) --> http://vimeo.com/6030983

More to come, but this makes things much easier to work on for me :)
2009-08-13 05:21:25 +00:00
William Reynish
44ca632ce7 Added game soft body settings, and cleaned up layout there slightly.
Also converted some other percentage properties to use sliders, and a few other small layout tweaks.
2009-08-12 22:16:47 +00:00
Daniel Genrich
fb7c9d5a0d Smoke:
* New feature: "Dissolve Smoke" - Idea by nudelZ
2009-08-12 17:32:02 +00:00
Arystanbek Dyussenov
6a056e4717 - converted 3ds exporter to 2.5 API
- added Object.is_visible() RNA function to determine if an object is on the visible layer of active scene
2009-08-12 16:37:05 +00:00
William Reynish
7ca23e0ef6 Put back sequencer type icons, and moved the type menu, separating it from the menus. 2009-08-12 14:39:57 +00:00
William Reynish
7ffbaa6631 Sequencer UI layout tweaks.
There was a mix in the layout of these panels; some were single column, some dual column. All these n-key sidebars seem to work best with single column layouts to minimize wasted space, so made all the panels fit that paradigm.

Also included a bunch of labels and a bit of layout cleanup.
2009-08-12 14:21:43 +00:00
Janne Karhu
b221c0e2e6 New point cache file format:
- HEADER (beginning of each file)
	* general header:
		+ 8 char: "BPHYSICS"
		+ 1 int: simulation type (same as PTCacheID->type)
	* custom header (same for sb, particles and cloth, but can be different for new dynamics)
		+ 1 int: totpoint (number of points)
		+ 1 int: data_types (bit flags for what the stored data is)
- DATA (directly after header)
	*totpoint times the data as specified in data_types flags

- simulation type
	soft body = 0, particles = 1, cloth = 2
- data types (more can be added easily when needed)
	data		flag		contains
	----------------------------------------
	index		(1<<0)		1 int	(index of current point)
	location	(1<<1)		3 float
	velocity	(1<<2)		3 float
	rotation	(1<<3)		4 float	(quaternion)
	avelocity 	(1<<4)		3 float	(used for particles)
	xconst		(1<<4)		3 float	(used for cloth)
	size		(1<<5)		1 float
	times		(1<<6)		3 float (birth, die & lifetime of particle)
	boids		(1<<7)		1 BoidData
	
Notes:
- Every frame is not nescessary since data is interpolated for the inbetween frames.
- For now every point is needed for every cached frame, the "index" data type is reserved for future usage.
- For loading external particle caches only "location" data is necessary, other needed values are determined from the given data.
- Non-dynamic data should be written into an info file if external usage is desired.
	* Info file is named as normal cache files, but with frame number 0;
	* "Non-dynamic" means data such as particle times.
	* Written automatically when baking to disk so basically a library of particle simulations should be possible.
- Old disk cache format is supported for reading, so pre 2.5 files shouldn't break. However old style memory cache (added during 2.5 development) is not supported. To keep memory cached simulations convert the cache to disk cache before svn update and save the blend.
- External sb and cloth caches should be perfectly possible, but due to lack of testing these are not yet enabled in ui.
	
Other changes:
- Multiple point caches per dynamics system.
	* In the future these will hopefully be nla editable etc, but for now things are simple and the current (selected) point cache is used.
	* Changing the amount of cached points (for example particle count) is allowed, but might not give correct results if multiple caches are present.
- Generalization of point cache baking etc operator & rna code.
- Comb brushing particle hair didn't work smoothly.
2009-08-12 09:54:29 +00:00
Campbell Barton
23e0571853 added time units, currently only used when metric or imperial are enabled.
long/short units...
day,d,  hour,hr,h,  minute,min,m, second,sec,s,  millisecond,ms,  microsecond,us

Also may fix some bugs that were reported.

Note, to convert fps to time evil_C needs to be used to get the scene.
2009-08-12 05:20:16 +00:00
Campbell Barton
b2a77852ff user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.

* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil

* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
Thomas Dinges
cf23d1948f 2.5: User Preferences:
* Code cleanup. Note: This file doesn't follow the UI code guidelines due to some more complex layout structure. 
Will think about this special case.

* Added new Sound Options into the System settings.
2009-08-11 18:19:09 +00:00
Brecht Van Lommel
8dd523a154 2.5: Fixes
* Disable shaded mode for now, it cause too many crashes combined
  with preview render, will be fixed properly later.
* Make 3d view toolbar region a bit wider. Ideally this would not
  be needed, but the sculpt/paint buttons just don't fit otherwise.
* Revert change to icon/text spacing in buttons, it breaks text
  editing and clipping. Will properly fix this later so changing
  the spacing can be done centrally.
* Fix for grease pencil simplify stroke python error. Now button
  is hidden (as in 2.4), but still available through outliner.
* Fix for memory leak in UI code, when using ctrl+Q menu.
* Fix submenu > icon being drawn on some buttons where it was not
  needed.
2009-08-10 20:57:12 +00:00
Joerg Mueller
a27cc1adf0 2.5 audio cleanup:
* Removed CD Actuator
* Removed bSample and bSoundListener
* Removed SoundSystem
* Removed -noaudio parameter
2009-08-10 15:39:11 +00:00
Arystanbek Dyussenov
675936b42c - ran 2to3 on export_3ds.py, import_3ds.py and export_x3d.py
- added operators and menu items for ^
2009-08-10 13:49:55 +00:00
William Reynish
90e2ffd538 IK constraint and armature modifier layout tweaks 2009-08-10 12:17:12 +00:00
Campbell Barton
6c951fbb98 adding back button evaluation so you can do 1/60, 90*0.1 etc as well as dimension conversion 1km-10cm+4ft
Note...
- Python3.1 you don't need to add the .0 for divisions anymore (was esp annoying for button eval)
- Simple dimension input, imperial mi/yd/ft/in, metric km/m/cm/mm,  Later could display these values and have a pref for scene scale, atm it assumes 1BU == 1m.
2009-08-10 11:58:53 +00:00
Campbell Barton
7440fee85c remove python2.x support 2009-08-10 00:07:34 +00:00
Nicholas Bishop
c1ca2ab5dc Sculpt/2.5:
* Added toolbar UI for setting "anchored" mode
* Added a "persistent" mode for the layer brush; basically you can keep sculpting on the same layer between strokes when this is on. There's a button to reset the base so you can add another layer on top of that, and so on.
This feature was suggested by Blenderer on BA, thanks!

Note, I think these options could use better names in the UI, but I couldn't really think of anything very descriptive, suggestions welcome
2009-08-09 17:21:40 +00:00
Daniel Genrich
07bd579fc1 Smoke: little fix to ui 2009-08-09 12:50:39 +00:00
Campbell Barton
d53e82cbca povray integration
- declare materials and reference them later
- support ray-transp filter setting
- blobs pigment wasn't working right
2009-08-09 07:09:32 +00:00
Daniel Genrich
d48ca69985 Smoke: decoupling of wavelet #2, new noise strength option on gui, fftw3 option in place for cmake, scons yet uncommited 2009-08-09 01:30:32 +00:00
Thomas Dinges
c4c0753dcc 2.5 Button Files:
* Cleanup of smoke and texture files to match guidelines. 
* Made "Curve" Panel in Toolbar Closed per default.
2009-08-08 17:21:34 +00:00
William Reynish
e213d4078b Improved layout of voronoi texture. There was some strange empty space. 2009-08-08 14:17:55 +00:00
Arystanbek Dyussenov
d1f22f6ce3 Copied 3DS, X3D scripts to release/io naming them after [import|export]_[format].py scheme. 2009-08-08 11:44:56 +00:00
Arystanbek Dyussenov
8fa528cef8 Added Object.find_armature() to find armature connected to object. Previously this was BPyObject.getObjectArmature() 2009-08-08 11:33:34 +00:00
Thomas Dinges
039d4d427b 2.5 3D View Toolbar:
Brush Panel:
* Separated the code for different modes, easier to maintain.
* Only settings which are used in the current paint mode are shown now.
2009-08-07 19:16:59 +00:00
William Reynish
0ce86b0a76 Added material game physics options in RNA and layout.
Thanks to the new render API system these options don't clutter up the layout when you're not doing games.
2009-08-07 19:14:49 +00:00
Thomas Dinges
1311b2f78b 2.5: 3D View Toolbar:
* Added some greying out and hiding for disabled/non available settings.
* Some layout tweaks.
* Added "Flip Direction" for Sculpt, this is the "Add, Sub" Option from 2.49, this time as a boolean. Off = Add, On, Sub.
2009-08-07 09:45:48 +00:00
Campbell Barton
bc093b4cc4 svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22205:22290 2009-08-07 04:41:15 +00:00
Dalai Felinto
77d79ffb5d BGE: removing remaining reference to sce->world->gravity/physics/... (it's all in sce->gm now) + Dome UI changes
UI changes: splitting dome options for different dome modes (eg angle doesn't work for envmap mode)
if anyone wants to tweak that, feel free to do it.

* I put a remaining to bring setEyeSeparation + Focal Length to the Stereo GUI. I'm still not sure what would be the default parameters for that, and that will require other changes (eg remove the flag m_setfocallength and m_seteyesep). For so far only a label remind :)
2009-08-07 03:06:32 +00:00
Campbell Barton
917fce65a6 Povray
* Sun lamp type export (known as parallel lights in povray)
* Native support for blenders metaballs, currently exports
 - ball and ellipsoid types
 - radius, stiffness
 - ellipsoid xyz scale
 - negative elements
 - single material (like blender)

Renamed rna props.
 elem.sizex -> size_x
 mball.last_selected_element ->  mball.active_element

minor changes to UI scripts.
2009-08-07 01:05:33 +00:00
Thomas Dinges
0ac90cabe1 2.5 Mesh Draw Options: [WIP]
* Added RNA for Mesh Draw Options.
* Added "Draw" Options into the Mesh Data Tab, needs check for Edit Mode.

* Fixed a typo in DNA.
2009-08-06 23:34:14 +00:00
Campbell Barton
042fe910aa - fix for a crash in readfile.c, thanks Roelf for finding.
- add media option for povray
- remove unintentional line from modifier script
2009-08-06 23:19:05 +00:00
Campbell Barton
a791cfc5d3 [#19206] Fix MD2 Vertex Normal Export
from Calvin Loncaric (marvinx03)

[#18965] Blender Load and Run need fully qualified specs
[#18966] getMaterials not used
from Roger Wickes (roger)
2009-08-06 22:24:14 +00:00
Thomas Dinges
e84e6664c2 -Use getattr() now for constraints too. :)
-Deleted old Buttons C code for RIGIDBODYJOINT constraint.
-"Realtime" Icon for Modifer was different in Template and RNA, i changed the Icon in RNA to match the template version, which is an eye instead of a cube.
2009-08-06 18:31:25 +00:00
Daniel Genrich
2fd0263602 smoke: decoupling high-res, introducing reset for heat+gravity, fixing another obstacle problem 2009-08-06 16:50:02 +00:00
Daniel Genrich
65cf500fdc smoke gui: refining the new simulation panel ui
(thanks to nudelZ for this patch)
2009-08-06 15:55:42 +00:00
Thomas Dinges
f10647e203 2.5 Smoke:
Moved the Smoke Buttons into the Physic Tab.
2009-08-06 14:23:48 +00:00
Campbell Barton
d608d33583 output the origin for each map node.
thanks to j michaelson for the patch
2009-08-06 13:30:23 +00:00
Campbell Barton
07ed542187 pedantic changes to python UI scripts
- SOFTBODY -> SOFT_BODY
- Use getattr() with enum value to get the modifier function rather then a lot of elif's
2009-08-06 13:15:23 +00:00
Arystanbek Dyussenov
01eedc5046 - OBJ importer now reads most of the test files. Had to copy BPyMesh.ngon function to OBJ import code
- added MeshEdge.fgon property, not using it yet
- fixed in bpy_rna.c to correctly read arrays returned from RNA functions
2009-08-06 12:22:50 +00:00
Joseph Eagar
38de6d14e4 merge with 2.5 (not trunk, last merge message said that on accident) at r22252 2009-08-06 09:56:14 +00:00