Commit Graph

3575 Commits

Author SHA1 Message Date
Dalai Felinto
4ea3f1cc29 using Blender 2.49 as playback for Ctrl+F11 doesn't take 'frame step' into consideration
... now it does ;) -- self-reported bug, not in tracker. Sorry statics people.
2011-09-28 17:57:12 +00:00
113d556295 patch [#28571]
from Bastien Montagne (mont29)

Only applied Sequencer Select Grouped functionality - similar to the one in object mode, select strips based on type, time, data etc.
2011-09-28 14:12:27 +00:00
4158cee688 color strip was showing image crop and and offset twice, also made 'Make Metastrip' key shortcut Ctrl+G (so shift+G can be used for select group like object mode) 2011-09-28 08:03:02 +00:00
4a157de23d svn merge ^/trunk/blender -r40587:40643 2011-09-28 07:34:48 +00:00
dcccf3fc1f navmesh: solve bad level calls to edit mesh functions
Move navmesh operators from editors/object to editors/mesh
2011-09-27 09:09:52 +00:00
effea8c29b svn merge ^/trunk/blender -r40511:40587 2011-09-27 03:12:31 +00:00
fbdfdfefd8 use BLI_snprintf rather than sprintf for interface functions 2011-09-26 16:53:04 +00:00
8a423f59ea pep8 cleanup and fix for keymap test operator from my own recent fix. 2011-09-26 15:39:15 +00:00
e1e5371335 fix for keymap export, move functions common for the UI and operators into bpy_extras.keymap_utils 2011-09-26 11:22:07 +00:00
573ed73be8 change define INTERNATIONAL --> WITH_INTERNATIONAL
also rename backface_culling --> use_backface_culling (which is used elsewhere in rna)
2011-09-26 10:35:47 +00:00
0aa19de52f add missing imports to wm.py and remove "." from rna descriptions. 2011-09-26 09:31:24 +00:00
Dalai Felinto
11a0e00819 BGE Material settings renaming Back Culling to Backface Culling and make it on by default
under suggestion of Mitchell Stokes (Moguri)
2011-09-26 06:39:19 +00:00
Dalai Felinto
2d91b6cda7 wm.py needs import os in some of its execute funcs + now we can have blender2.60x version :)
I guess someone did a cleanup in the file and forgot to test "add an Add-On" ;)
+ a bug I found while studying the cmake files
2011-09-26 06:29:58 +00:00
Alex Fraser
558b646216 Committing patch #27442: Adaptive time step for fluid particles. The number of
subframes can now be altered automatically while an SPH (fluid particle)
simulation is running.
2011-09-25 11:51:28 +00:00
81f7e361d2 make new rna variables more consistant with existing names. 2011-09-25 02:49:46 +00:00
c0c488d0b2 Merged changes in the trunk up to revision 40520. 2011-09-24 21:39:11 +00:00
dab7dba2db svn merge ^/trunk/blender -r40498:40511 2011-09-24 11:03:52 +00:00
c658442c65 - move animsys update operator into the anim.py
- move the data into animsys_refactor.py module so its not loaded on blender start.
2011-09-23 17:38:52 +00:00
d7a5429f42 svn merge ^/trunk/blender -r40491:40498 2011-09-23 13:55:06 +00:00
c658b74db5 minor edits to recent fix for addons 2011-09-23 13:47:29 +00:00
38132d68d6 fix script error and quiet warnings about "." description ending. 2011-09-23 13:31:48 +00:00
f7c8ea702f * Some more fixes for recent move operator commit. 2011-09-23 13:29:28 +00:00
9494340dae svn merge ^/trunk/blender -r40432:40491 2011-09-23 13:04:01 +00:00
75e7f63322 svn merge ^/trunk/blender -r40431:40432 2011-09-23 11:47:53 +00:00
5bd83eede0 svn merge ^/trunk/blender -r40405:40431 2011-09-23 11:30:55 +00:00
460cde345b svn merge ^/trunk/blender -r40394:40395 2011-09-23 10:43:25 +00:00
a13f94865a svn merge ^/trunk/blender -r40371:40372 2011-09-23 05:59:37 +00:00
728cf26ee4 * Fix for the Operator move commit, missed includes.
* import os at the beginning of file
2011-09-23 05:20:15 +00:00
458b920abb remove bl_operators/nla.py, move bake_action function into bpy_extras.anim_utils and bake operator into bl_operators/anim.py 2011-09-22 22:51:54 +00:00
ea32492dd5 SVN maintenance. 2011-09-22 20:37:22 +00:00
e17ee1b415 2.6 Python UI files:
* Moved Operators from bl_ui into bl_operators.
* Renamed HELP_OT_operator_cheat_sheet to WM_OT_operator_cheat_sheet.
2011-09-22 19:50:41 +00:00
7126a4699e svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge 2011-09-22 16:09:27 +00:00
402f583abd Fix warnings about operator descriptions ending with "." 2011-09-22 15:44:35 +00:00
cf46edfcbc correction for removal of _("") 2011-09-22 07:01:28 +00:00
f1a227cf43 check that descriptions dont end with a '.', for non release builds.
this is annoying for translators so rather then correct along the way which gives merge conflicts for branches - print a complaint message.
2011-09-21 17:52:51 +00:00
14475d07cd svn merge -r40295:40367 ^/trunk/blender 2011-09-21 17:15:54 +00:00
f4c56a879d remove use of gettext: _("...") style translation now its handled by rna. 2011-09-21 15:18:38 +00:00
9c42afb1c0 Merged changes in the trunk up to revision 40413.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
2011-09-20 21:22:15 +00:00
8f5112f191 pep8 update & some minor cmake edits. 2011-09-20 18:29:19 +00:00
9e9b26b8ba Dynamic Paint:
* Brush ui still had references to old "Non-Closed" property.

Note that old Dynamic Paint saves no longer work in carrot revisions 40411 and later due to new modifiers that were added into trunk. :(
2011-09-20 18:16:44 +00:00
15cb47bf91 Merge with trunk r40409 2011-09-20 17:51:04 +00:00
0af633a36c move message.txt generator out of wm.py (which was loaded with blender always), into it own py script which runs on its own, also added this to 'make translations' target. 2011-09-20 17:44:45 +00:00
7172316b94 Merging r40366 through r40392 from trunk into soc-2011-garlic 2011-09-20 12:01:16 +00:00
bba54a051a i18n: fake_gettext is no longer needed for python 2011-09-20 08:38:16 +00:00
5582d9fac1 Rearranged the organization of chaining options in line styles.
New there are only two chaining types: plain and sketchy.  Both chaining types
have the "same object" option.  With this option enabled, only feature edges of
the same object are chained.  The sketchy chaining also has the "rounds" option
to specify the number of rounds in a sketchy multiple touch.

Also removed a temporary workaround (implemented by means of a custom chaining
rule) for infinite straight lines, which has resulted in much cleaner strokes.
2011-09-19 23:24:14 +00:00
38f24637d4 Added new line style options for sketchy chaining of feature edges.
The default chaining option is now called "Natural", while the new chaining options
are "Sketchy: Topology Preserved" and "Sketchy: Topology broken".  The latter two
options allow for generating chains of feature edges with a sketchy multiple touch.
The "Sketchy: Topology Preserved" option takes account of the topology of objects
in the view map, while the "Sketchy: Topology broken" ignores the edge topology.
The "rounds" option specifies the number of rounds in sketchy strokes.
2011-09-19 22:40:44 +00:00
Dalai Felinto
b263aefb0e TexFace to Material Settings big patch
Summary:
========
The idea here is to move the texface options into the material panel.
For images with the change please visit:
http://code.blender.org/index.php/2011/09/bge-material-texface-changes

1 - Some of the legacy problems 2.49 and 2.5x has with the texface system:
==========================================================================
1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can
select a face to be more than one mode.
1.2) Sort only works for blend Alpha yet it's an option regardless of the
Transparency Blend you pick.
1.3) Shared doesn't affect anything in BGE.
1.4) ObColor only works for Text objects (old bitmap texts) when using Texture
Face Materials. (not address yet, I so far ignored obcolor)

2 - Notes:
============
2.1) Now "Use Face Textures" in material Option panel will work in Multitexture
even if there is no texture channel.

2.2) In FaceTexture mode it will use TexFace all the time, even if you don't
check the "Use Texture Face" option in the UI. It's a matter of decision, since
the code for either way is there. I decided by the solution that makes the
creation of a material fast - in this mode the user doesn't need to mess with
textures or this "Use Texture Face" option at all. I'm not strong in my opinion
here. But I think if we don't have this then what is the point of the Texture
Face mode?

2.3) I kept references for tface only when we need the image, UV or the tiling
setting. It should help later when/if we split the Image and UV layers from the
tface struct  (Campbell and Brecht proposal).

3 - Changes in a Nutshell:
==========================
3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set.

3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …).

3.3) New options in the Material Panel
* Shadeless option in the Material panel is now supported for all three Shading modes.
* Physics is now toggleable, this is the old Collision option.
* Two Side (on) is now called Back Culling (off).
* Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid).
* Shadow, Billboard and Halo are grouped in the “Face Orientation” property.
* "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually).
* The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties.

4 - Acknowledgment:
==================
Mike Pan for the design discussions, and testing along the whole development process.
Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that.
Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems).
Blender artists that gave feedback and helped testing the patch.

Patch review and original documentation can be found here:
http://wiki.blender.org/index.php/User:Dfelinto/TexFace
http://codereview.appspot.com/4289041/
2011-09-19 19:55:59 +00:00
8dbc7a3ba3 Merging r40345 through r40365 from trunk into soc-2011-garlic 2011-09-19 15:47:05 +00:00
2cbf475fb2 Merged 40338-40364 2011-09-19 15:36:30 +00:00
712e434a5f /release/scripts: Removed final points in UI strings and messages. 2011-09-19 14:00:42 +00:00