Commit Graph

27322 Commits

Author SHA1 Message Date
a13f94865a svn merge ^/trunk/blender -r40371:40372 2011-09-23 05:59:37 +00:00
58e7678952 svn merge ^/trunk/blender -r40370:40371 2011-09-22 16:30:33 +00:00
d7e5f348c8 svn merge ^/trunk/blender -r40368:40370 2011-09-22 16:17:27 +00:00
7126a4699e svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge 2011-09-22 16:09:27 +00:00
10d6e1e16a Normal math improvements and vector math cleanup 2011-09-22 12:31:01 +00:00
14475d07cd svn merge -r40295:40367 ^/trunk/blender 2011-09-21 17:15:54 +00:00
b602024a26 Fix rip tool issues related to BM_Make_Ngon generating a copy of an original face with a face loop cycle starting on a different loop. 2011-09-21 15:38:34 +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
80ad78dbb5 style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts. 2011-09-19 17:53:37 +00:00
439f0ef7dd SVN maintenance. 2011-09-19 17:27:33 +00:00
b2e97edc35 remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset. 2011-09-19 16:41:29 +00:00
535668eef0 Merging radish branch into trunk.
http://wiki.blender.org/index.php?title=User:Jason_hays22/GSoC-2011
2011-09-19 16:13:34 +00:00
2cbf475fb2 Merged 40338-40364 2011-09-19 15:36:30 +00:00
d78231734d attempt to fix windows/scons issue I caused in a recent commit. 2011-09-19 15:18:58 +00:00
05683f8e52 edits to argument parsing for Euler.rotate_axis, also corrected some exception messages and minor style edits. 2011-09-19 15:13:16 +00:00
94016ed285 vgroup_validmap needed to be assigned when locks were active. 2011-09-19 15:11:01 +00:00
0f5d3a3ddb add back mathutils Matrix() * Vector(), this is row_vector multiplication.
some minor changes to exception messages.
2011-09-19 14:29:21 +00:00
5c7b5c0b51 Blenfont: fix use incorrect clear of ascii glyph cache, leading to crash
when toggling use antialising user preference. Also fix some other use of
uninitialized memory found by valgrind.
2011-09-19 14:09:13 +00:00
1794767171 /blender/makesrna: Removed final points in UI strings and messages.
Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
1d48c8db7f Sequencer: switching to preview mode works fine again 2011-09-19 13:12:54 +00:00
9d3b1f708f Move function out of mathutils to: BLI_math_rotation --- single_axis_angle_to_mat3(mat3, axis, angle), copied out from mathutils, axis arg is a char 'X/Y/Z' rather then a vector like axis_angle_to_mat3(). 2011-09-19 13:08:01 +00:00
f157a543c6 /blender/editors: Removed final points in UI strings and messages.
Plus a few cuts in very long lines…
2011-09-19 12:26:20 +00:00
9478167493 remove Buffer.list, deprecated before 2.59 release. 2011-09-19 11:55:45 +00:00
226ff0d4da Curve back/front fill changes:
- Use enum instead of back/front flags combinations.
- This flags behaves differently for 2d/3d curves so use different enums for them.
- This commit shouldn't change existing files.
2011-09-19 09:47:58 +00:00
dd204cb9f7 Fix for add hook/vertex parent for meshes
The only way to achieve this is to re-load editMesh.
After this commit you can't iterate through vertices and insert
hooks/parents from script anymore -- this operators are now
treated as topology-changing and shouldn't be used when iterating
via geometries.
2011-09-19 08:25:31 +00:00
4e9ab6d04c replace WORDS_BIGENDIAN with __BIG_ENDIAN__ 2011-09-19 08:11:30 +00:00
83a2f02a78 cleanup endian handling
- define __BIG_ENDIAN__ or __LITTLE_ENDIAN__ with cmake & scons.
- ENDIAN_ORDER is now a define rather than a global short.
- replace checks like this with single ifdef: #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- remove BKE_endian.h which isn't used
2011-09-19 08:02:17 +00:00
425a81a29b remove WITH_* defines from image formats, instead just dont build the files at all. 2011-09-19 06:32:19 +00:00
20463cb842 svn merge ^/trunk/blender -r40311:40338 2011-09-19 05:58:52 +00:00
e197b993d3 remove duplicate variable - wpaint_make_validmap(ob) was being called twice for no good reason. 2011-09-19 05:06:21 +00:00
8835a18e2e refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function. 2011-09-19 04:53:11 +00:00
a89b253aa6 edits to radish before merge with trunk
- removed some unused functions.
- renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags'
- some odd modifications were made in unrealted, commented code, copy these back from trunk.
- rename vertex_group_fix 'cp' property to 'accuracy'
- make style more consistant with trunk.
- remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
73863a1da5 Split do_weight_paint_vertex() to isolate the simple case.
Added a tool-tip to the "fix deforms" op.

Removed code markers:
"Radish"
2011-09-18 17:10:28 +00:00
e234cb4636 add back object update function for auto-normalize too. 2011-09-18 15:20:10 +00:00
f0071799b6 allow multiple bones to be selected in weight paint mode in a less complicated way (allow Shift+RMB) 2011-09-18 15:17:16 +00:00
f4207ca417 style changes only 2011-09-18 14:54:41 +00:00
24eaf6b9b8 replace malloc of a single DeformVertex with stack variable. 2011-09-18 14:48:15 +00:00
9a0b035e1d add back GPL2+ header to paint_utils.c, copied from editface.c since some of its functions trace back to that file from 2.4x. (imapaint_tri_weights for eg). 2011-09-18 12:16:03 +00:00
cad688a705 add old style nan GPL2+ header to sound.c since this file is from rev2 and should have had this header added. 2011-09-18 12:06:28 +00:00
82e6547a36 patch [#28684] Image pack/unpack() implementation.
from Bill Currie (taniwha)
2011-09-18 11:47:17 +00:00
b17a62d1b3 replace strnlen with BLI_strnlen & some style changes. 2011-09-18 11:25:50 +00:00
507aa1cd22 fix for crash loading a file saved with fluidsim when blenders compiled with it disabled.
also remove unneed class prefix on function name for itasc.
2011-09-18 11:08:34 +00:00
53845a37d9 blf - further shrink drawing functions & some style changes. 2011-09-18 10:34:13 +00:00
249b41762a blf code - no functional changes.
- remove saniy checks from blf_font.c, the callers now check instead.
- move duplicate code into defines (may move into static functions).
- move kerning checks into const values set at the start of the function, rather then checking on every character.
2011-09-18 09:48:09 +00:00
7da6e0c82e Fix for [#28672] Blender segfault after exiting a game that was opened with autoplay on (Blender, not blenderplayer)
Autoplay misses uninitialisation, I'm just fixing the reported crash, it still misses all other frees, but as the program exits, we don't care?
2011-09-18 09:46:47 +00:00
fa3082bace Minor: Other UI strings typos and tweaks. 2011-09-18 09:38:43 +00:00
a9c99f58f4 Changed the branch code markers to say "Radish" in response to a review.
They weren't & aren't meant to show ownership, they just help me navigate my related code.
2011-09-18 03:49:00 +00:00
6d2b98ac89 added back scene/object update function, its needed for multipaint switching. 2011-09-18 03:29:17 +00:00
8f925a39b9 rename EM_backbuf_checkAndSelectTVerts to EM_backbuf_checkAndSelectVerts_obmode until we come up with a better name this one at least says its in object mode, also there is no such thing as a TVert. 2011-09-18 02:46:03 +00:00
96ada15d79 svn merge -r40197:40311 ^/trunk/blender 2011-09-18 02:35:26 +00:00