Commit Graph

29262 Commits

Author SHA1 Message Date
c0eec8f379 svn merge ^/trunk/blender -r43062:43085 2012-01-03 02:16:52 +00:00
0eb8a384c9 Remove some silly variable copies that stuck around from a previous refactor. 2012-01-02 19:01:16 +00:00
1e18da32fb replace:
CTX_data_pointer_get_type(C, "object", &RNA_Object).data
with api call:
  ED_object_context(C)

... since getting the context object is such a common operation.
2012-01-02 17:15:24 +00:00
aa43cab820 weight paint buttons now work in weight paint vertex select mode 2012-01-02 16:59:46 +00:00
1fc26516ea Fix #29746: cycles crash with border render. 2012-01-02 16:20:18 +00:00
5c27b34fbf nicer string delimiter handling for Ctrl+Left/Right arrows, py console could use this functon too. 2012-01-02 15:27:01 +00:00
9dc085e0cb Fix #29738: missing includes in RNA, patch by Dan Eicher. 2012-01-02 13:45:42 +00:00
68c4368001 dont save MFace's from BMesh, this means they stay used but only for tessface cache.
also saves on undo memory and disk space.
2012-01-02 12:37:58 +00:00
Alex Fraser
15dc3d4609 Fixes two crashers for games, with GHOST under SDL:
- Fixes SDL fullscreen mode for game engine (blenderplayer). Mode switching (resolution changes) not supported yet though.
- Fixes embedded game engine exit.
See patch tracker [#29748].
2012-01-02 12:35:06 +00:00
Alex Fraser
7d19ff1497 Added OpenMP multithreading for SPH particle systems. 2012-01-02 12:10:50 +00:00
Alex Fraser
b6fb3d97f1 SPH particle simulation fixes:
- Using correct frame to update particle system tree for SPH simulation (i.e. psys_update_particle_bvhtree(psys, cfra)).
 - Increased SPH neighbour count to 512 - this greatly reduces BVH tree search bias, and makes simulations more symmetrical.
Adaptive time step improvements:
 - Fix for relative velocities based on previous state (fixes fast-moving particle clusters).
 - Only reporting on element size once per time step. Prevents incorrect Courant number from being calculated when using multiple-step integration.
2012-01-02 11:46:02 +00:00
9a37e2682d slice and iterator access for matrix.col/row so you can do...
a, b = mat.col[0:2]

  and...

  for a in mat.col: ...
2012-01-02 09:04:37 +00:00
a0e42dc8ab fix for crash in the modifier stack when applying a deform modifier after a constructive modifier, also sync minor edits with trunk. 2012-01-02 06:53:09 +00:00
7a15b93e53 Edit BMesh --> Mesh conversion code was using its own face filling functions, replace this with a call to mesh_recalcTesselation() once everything else is converted.
gives an overall 3x speedup running bmesh_to_mesh_exec() on suzzane subsurf level 5 (applied).

also removes duplicate code.
2012-01-02 03:52:10 +00:00
c9b7eb06b2 picky formatting edits 2012-01-02 03:27:08 +00:00
b64f352270 svn merge ^/trunk/blender -r43033:43062 2012-01-02 02:57:36 +00:00
ec710a2929 remove Id's that crept in 2012-01-02 02:13:31 +00:00
ab097223d4 Fix [#29556] shrinkwrap generates spikes if vertices fall exactly on the edge
bvhtree_ray_tri_intersection now using isect_ray_tri_epsilon_v3 with FLT_EPSILON. All devs I asked (incuding ones in physics/painting areas) were rather OK with this change, and better to do it now, with more than one month to detect regressions, if any!
2012-01-01 16:37:01 +00:00
defa99b65c Fixed names of VertexWeight modifiers RNA structs, in RNA_access.h (probably forgotten when they were renamed, before the merge in trunk, and was never noticed as they are not used...).
Also removed the $ID$ from remesh modifier header, and quited a gcc warning.
2012-01-01 16:09:32 +00:00
9b45d8acad __func__ define for msvc since its not c99 compat 2012-01-01 10:27:53 +00:00
2c072d8f85 rna api - set hard min/max for colors which are float properties but internally use chars to 0/1. 2012-01-01 09:39:43 +00:00
f01ac19c3c use __func__ for makesrna.c error prints rather then the function name (no functional changes) 2012-01-01 09:19:22 +00:00
85242e9f6c Fix blenderplayer build (by adding missing bad level call stubs) 2011-12-31 17:46:42 +00:00
1b4487e813 Fix [#29728] Explode Modifier Causes Crash.
The problem was in fact in recent BLI_edgehash changes: a typo in the new macro EDGE_ORD made v0 > v1, instead of v0 < v1. This caused the bug in explode modifier, which (ab)uses that ordering feature a bit…
2011-12-31 15:10:38 +00:00
71bc053bb2 remesh now working for bmesh 2011-12-31 12:58:03 +00:00
78a4e24614 svn merge ^/trunk/blender -r43009:43033 2011-12-31 12:03:36 +00:00
3bb3d46ccf Code cleanup: do not use check for nan when doing check for finite due to
finite() would be FALSE in case of nan to.

Thanks to Campbell for this information.
2011-12-31 11:03:32 +00:00
6c10080d24 Fix: Material "Vertex Color Light" option didn't apply vertex alpha. 2011-12-31 10:46:21 +00:00
0f2f2fe1a8 Dynamic Paint:
* Fix: Smudge and brush velocity settings didn't work for "image sequence" surfaces unless any paint effect was enabled.
* Adjusted some property ranges.
2011-12-31 10:28:36 +00:00
359a95bdc9 Changing KX_FontObject to look for a "Text" game property instead of a "text" property to match with bitmap font usage. 2011-12-31 09:37:19 +00:00
59b406ce73 Minor code cleanup after resolving conflicts 2011-12-31 09:30:39 +00:00
1ad83b4cba Tag object with object solver constraint to recalc when changing value of
tracking object scale.
2011-12-31 08:26:59 +00:00
70d13da457 Do not set scene's camera on camera solving and cursor snapping 2011-12-31 08:26:32 +00:00
33b1717d59 fix [#29734] Crash after bpy.ops.file.direrectory_new() 2011-12-31 03:52:07 +00:00
39ef41a022 fix [#29735] Blender crashes with ACCESS_VIOLATION when snapping cursor to camera 2011-12-31 03:45:31 +00:00
ba8d1b940f option to build without remesh modifier for cmake and scons 2011-12-31 03:34:44 +00:00
81f5c9ed9b svn merge ^/trunk/blender -r42991:43009 2011-12-31 03:07:14 +00:00
65c74f1570 workaround for error building with clang and quiet some warnings building without libmv. 2011-12-31 03:01:18 +00:00
14f5f264ec Small tweaks from Zafio for the remesh modifier icon 2011-12-30 23:10:23 +00:00
4b9457dd4a Patch is partially made by Pelle Johnsen. Thanks!
This patch enables search for specific libraries for vc2010 using "set_lib_path" macro
If *x* library or path exists in lib/win___/vc2010/*x* , vc2010 will use it. If not, compiler will use standard libraries.
It can be easily extended to gcc.

The function is enabled for:
openCollada
openExr
Python
openImageIO

The different libraries are needed for different compilers because C++ was used. There is no standard for lib's C++ structure/functions' names.

Actual libs will follow
2011-12-30 22:10:48 +00:00
fe9b909187 Fix for Remesh Modifier:
* Remesh Icon was missing in the outliner.
2011-12-30 21:29:02 +00:00
289c8b5758 Add remesh modifier (dual contouring).
This patch adds a new remeshing modifier. The algorithm is based on
the paper "Dual Contouring of Hermite Data", and the implementation
was contributed to Blender by Dr. Tao Ju.

The contributed code is in intern/dualcon, and was modified to compile
under gcc and work on 64-bit systems. Files not needed for Blender
were removed and a small C wrapper was added in order to interface it
with Blender. The rest of the patch is just standard modifier stuff.

Reviewed by Sergey, code review link:
http://codereview.appspot.com/5491053/

The remesh icon was contributed by Zafio:
http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2.
Thanks to everyone in that thread for the icon proposals and
discussion.

Documentation and examples on the Blender wiki:
http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier

In case the history is needed for anything, check the remesh-modifier
branch of this git repository:
https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
792452a7e5 Disable markers when doing frame-by-frame tracking and tracker library returns failure 2011-12-30 18:15:44 +00:00
3c6e818b22 Object tracking integration
This commits merges object tracking implementation from tomato branch.

Summarized changes from branch:

- Added list of objects to be tracked. Default there's only one object called
  "Camera" which is used for solving camera motion. Other objects can be added
  and each of them will have it;s own list of tracks. Only one object can be used
  for camera solving at this moment.
- Added new constraint called "Object Tracking" which makes oriented object be
  moving in the save way as solved object motion.
- Scene orientation tools can be used for orienting object to bundles.
- Object has got scale to define "depth" in camera space.
- All tools which works with list of tracks or reconstruction data now
  gets that lists from active editing object.
- All objects and their tracking data are available via python api.
- Improvements in witness cameras workflow,
2011-12-30 18:06:02 +00:00
532afede02 patch [#29726] Enable looping with Follow Path constraint and cyclic curves. by Peter Amstutz (tetron) 2011-12-30 14:52:03 +00:00
d7d856a23d Color management: add "Color Unpremultiply" option for images and render settings.
For premultiplied alpha images, this makes any color space conversion for the image
or render output work on color without alpha multiplied in.

This is typically useful to avoid fringing when the image was or will be composited
over a light background. If the image will be composited over a black background on
the other hand, leaving this option off will give correct results.

In an ideal world, there should never be any color space conversion on images with
alpha, since it's undefined what to do then, but in practice it's useful to have
this option.

Patch by Troy Sobotka, with changes by me.
2011-12-30 14:17:11 +00:00
424e09a2ce use PyUnicode_From_STR_String in the game engine in more places. 2011-12-30 12:44:16 +00:00
Dalai Felinto
c52f780021 cucumber merge, multiline font object:
revisions: 38384,38387,38403,38404,38407,42997,42998

#42998 by dfelinto
BGE Font Object - fix for offset
(scaling also has to be taken into account here)

#42997 by dfelinto
Font Object Multiline fix.
The offset was totally wrong when object had scale[1] != 1

#38407 by kupoman
Changing the "text" property of a KX_FontObject now changes the text. This allows for control of a FontObject through logic bricks.

#38404 by kupoman
KX_FontObject now supports the x and y offset options.

#38403 by kupoman
KX_FontObject now makes use of the font's line spacing option, and correctly accounts for rotation and font size when applying the spacing.

#38387 by kupoman
The KX_FontObject text attribute is working again.

#38384 by kupoman
Primitive support for the new line character added to KX_FontObjects. The line spacing is fixed, and does not work when the FontObject is rotated. Also, the text attribute has been temporarily disabled, as it needs some updating to support the multiline changes.
2011-12-30 12:28:51 +00:00
2c43f99c0a formatting edits, missed these last commit. 2011-12-30 11:49:58 +00:00
41cbc47fbe fix [#29686] Weight paint paints when it shouldn't
disallow painting when active group is locked
2011-12-30 11:37:54 +00:00