Commit Graph

36353 Commits

Author SHA1 Message Date
Campbell Barton
e67ba3d9df fix [#30209] "Tris to Quad" fails in some cases
dont join 2 triangles if the edge thet share has more then 2 face users.
2012-02-16 17:43:23 +00:00
Campbell Barton
49ab580143 more knit-picky memory saving
don't store a flag array, (or pointer to a flag array) per BMLoop.
saves 4 pointers per quad - obviously, so this can add up a bit.
2012-02-16 16:44:10 +00:00
Campbell Barton
f286061b39 ifdef out support for holes in faces.
this can be added back easily but currently this cant be saved into DNA and most likly support wont be added soon.

saves memory in editmode: 20 bytes per face or 40 on 64bit systems (5 pointers).
2012-02-16 15:38:16 +00:00
Campbell Barton
300bfd23e4 minor style cleanup, use macros for first loop and far name changes. 2012-02-16 15:13:29 +00:00
Campbell Barton
008f0e73ee bmesh todo. making an image local wasn't dealing with mesh polygon texface data. 2012-02-16 12:19:02 +00:00
Campbell Barton
f241451d17 some minor refactoring for edge disk link's, typedef their own struct type. 2012-02-16 11:48:09 +00:00
Campbell Barton
5fe525a6f6 style cleanup for code relating to BMLoop next/prev checks. 2012-02-16 09:44:22 +00:00
Campbell Barton
78f9bb6e91 svn merge ^/trunk/blender -r44118:44136 2012-02-15 18:32:08 +00:00
Dalai Felinto
93526b4c72 readfile update after version/subversion bump
Note, there is no need to leave doversion code outside a version/subversion nest.
e.g. having if version < 262   in a 2.61 file will make the code to double-run.
however this is the same case for the code nested outside the if versions ...
with the advantage of making ahoys/version bumping easier.

Ton himself was unaware of how we were doing this and suggested to get rid of the /* put subversion code here */ practise.
2012-02-15 18:17:31 +00:00
Campbell Barton
caf92365a5 autogenerated rna api changelog (no rebuilds needed) 2012-02-15 17:41:48 +00:00
Thomas Dinges
048ede5080 Set BLENDER_VERSION_CYCLE to release. 2012-02-15 17:19:26 +00:00
Ton Roosendaal
18371f792d The traditional release commit, 2.62!
Special thanks to splash committee:
Kevin Hays, Per Gantelius and Wray Bowling.

Splash by Alexey Lugovoy.
2012-02-15 16:44:44 +00:00
Brecht Van Lommel
697270a024 Fix another padding error in cycles, to complete the previous bugfix. 2012-02-15 14:56:08 +00:00
Campbell Barton
576ce5928f * correct bad pointer check in expand_local_mesh()
* check total polygons rather then faces in draw_mesh_object()
2012-02-15 14:40:45 +00:00
Campbell Barton
bc6bbcccc9 went over all uses of mesh->mface and added BMESH_TODO comments for
areas that need to be updated.
2012-02-15 14:39:18 +00:00
Brecht Van Lommel
2e752dea2f Fix #30139: multi render layer not working with CUDA render, due to padding error
in render pass code.
2012-02-15 14:32:07 +00:00
Sergey Sharybin
47d1c813d0 FFmpeg settings can't be animated. Clear animation flag to prevent confusing
warnings appear on the screen.
2012-02-15 14:05:28 +00:00
Sergey Sharybin
9d32f5dcd6 Movie clip: comment what magic constant 768 means in DNA structure 2012-02-15 13:41:33 +00:00
Campbell Barton
c0b2363358 fix [#30153] Crash in outline datablock display after switch to edit mode 2012-02-15 13:25:54 +00:00
Campbell Barton
1eb48de199 fix [#30186] Crash in execute the "Operator Cheat Sheet" 2012-02-15 12:39:18 +00:00
Campbell Barton
119993f88b quiet some warnings from commented code. 2012-02-15 12:27:45 +00:00
Campbell Barton
428f031237 svn merge ^/trunk/blender -r44076:44118 2012-02-15 12:08:06 +00:00
Sergey Sharybin
3ac1ad5378 CMake: determine if python should be bundled into "lib" or "lib64" folder.
Needed to deal with OS like openSUSE where Python is installed to /usr/lib64
and don't work if it's getting bundled into <blender_version>/python/lib.

Thanks to Campbell to making this patch cleaner :)
2012-02-15 08:53:28 +00:00
Dalai Felinto
91058355cc font objects in blenderplayer fail when object with alpha is rendered
the embed bge has its own DisableForText() routine which prepares the GL flags for the text render.

For some reason blenderplayer is taking a slim approach and going straight for the rendering. This routine helps to address this bug/case (non reported, foundin my own project files). If need arises we should move this to its own routine incorporating the other GL tests the embed bge performs.
2012-02-14 18:23:58 +00:00
Antony Riakiotakis
77223492fd Subsurfed uv unwrap tool ported to bmesh. 2012-02-14 17:48:05 +00:00
Sergey Sharybin
001299a0f6 Buildbot: WITH_BF_CYCLES_CUDA_BINARIES should be set for packing stage too. 2012-02-14 17:03:27 +00:00
Sergey Sharybin
5bff557744 Camera tracking: corrected default values for some reconstruction-related properties. 2012-02-14 17:03:06 +00:00
Sergey Sharybin
9df1fb5076 Buildbot: another attempt to make Windows builds support CUDA
Set BF_CYCLES_CUDA_NVCC to nvcc.exe, hopefully it's on search path at builder machine.
2012-02-14 15:59:10 +00:00
Sergey Sharybin
1df04f1dcd SCons: command line options should be coma-separated when adding to options list 2012-02-14 15:44:17 +00:00
Sergey Sharybin
b89beaf990 Buildbot: enable building CUDA binaries on Windows slaves.
Should make CUDA available for rendering in buildbot builds.
2012-02-14 15:26:20 +00:00
Antony Riakiotakis
40e2942f25 Fix related to #30152, rainbow colours produced when loading hdr image to 3D viewport/ the Nyan cat bug.
Issue is caused by scaling for power of 2 dimensions and mipmapping that happens through GLU. It looks like the library cannot handle float colour values above 1.0 correctly. Since we are close to release I will just clamp the srgb result for now even though it will result in a small performance loss for 16 bit textures only. 

I tried a few things before that, glGenerateMipmaps + no scaling (supported for 2.0 GL hardware and up), or using our own scaling instead of glu among them which worked very nicely and gave a speedup too. However, since we are close to release and there may be issues with GPU mipmap generation, see:

http://www.gamedev.net/topic/495747-another-glgeneratemipmap-question/
(old discussion but better be sure than sorry)

I went for the most compatible solution. Maybe after release this can be tested if other devs agree.
2012-02-14 13:25:23 +00:00
Sergey Sharybin
6825577cad Carve fixes and optimizations:
- Fixed memory lead in Carve_getIntersectedOperandMeshes
- Union manifolds only if they intersects second operand, leave manifolds
  which doesn't intersect second operand as-is.
2012-02-14 13:24:04 +00:00
Jens Verwiebe
2cf28ab2bc ffmpeg: don't use flags:loop for .h264, this allows to see the video in OSX quickview and Quicktimeplayer( windows ? ) 2012-02-14 12:24:17 +00:00
Howard Trickey
2e2b405918 Fix 30169: rotate edge needs more checking for bad cases
If you tried to rotate an edge that was part of a chain
between two faces, the join faces function would remove
the whole chain (else it would leave a 'spur') and then
rotate edge would crash looking for a vertex that is no
longer there. 
Check for this case and disallow rotate if so.
2012-02-14 11:40:25 +00:00
Sergey Sharybin
b5f08e60be Carve: improved handling of meshes with interesting manifolds
Unioning of intersecting manifold tried to perform as little union operations
as possible, but there were some not totally correct assumption which lead to
cases when unioning of manifolds of some mesh might be happened when one of
mesh sets already had got intersecting manifolds.

This commit corrects this incorrect behavior.

Discovered this when was looking into #30175: Boolean Difference causes 2.62 RC1 crash.
2012-02-14 09:43:35 +00:00
Mitchell Stokes
6905d0d92b Fixing up some buggy cleanup code in BL_ShapeDeformer. This code was causing crashes and corrupting shape keys. This commit fixes the following bugs:
[#30059] Shape Keys is gone in Blender if you use Add Object Actuator in BGE
[#30024] Segmentation fault after addObject when using shape keys
[#28683] segfault in shapekey conversion code when running a game (YF, level home) twice
2012-02-14 07:54:12 +00:00
Jens Verwiebe
441dc0fc7e OSX: to make transition for mediaimports to ffmpeg reliable, ffmpeg_0.10 is mandatory 2012-02-14 07:47:29 +00:00
Antony Riakiotakis
beea6a4a17 bring back stitchability indicator, this can work even now 2012-02-14 00:55:01 +00:00
Antony Riakiotakis
a9c6f553e7 Initial port of stitch operator for bmesh.
*operator now works with few limitations:

-still no preview(will be back soon)
-rotation will not work if only one uv is stitched between islands(will need method to calculate uv normal for manifold)

Also fixed island calculation for UvElements, fixes a crash when uv sculpting with "Sculpt all islands" turned off
2012-02-14 00:35:29 +00:00
Joerg Mueller
c0c1a9700e Fix for [#30171] "Audio Muted" Does Not Mute Audio 2012-02-13 21:27:11 +00:00
Brecht Van Lommel
873386b22d Fix #30170: with file saved in texture painting mode, when going to object mode
the image texture is missing. The flag to indicate that the mipmap levels were
already loaded into GPU memory was incorrectly set then.
2012-02-13 21:12:14 +00:00
Brecht Van Lommel
19ff61bfb3 Fix #30155: crash with popup menu open while new .blend file is loaded,
CTX_wm_window is then set to NULL and checked in the event queue, but it
should be checked for removing handlers too.
2012-02-13 21:05:04 +00:00
Campbell Barton
a53237f193 use tabs for indentation 2012-02-13 20:54:36 +00:00
Brecht Van Lommel
0fbff1be3e Fix quicktime export being broken in various ways: callback was missing
parameter, codec RNA wrapping was wrong, and there was a python script error.
2012-02-13 20:47:29 +00:00
Jens Verwiebe
62fa555b8e OSX: let almost all animation imports handle by ffmpeg now, this is faster in many cases 2012-02-13 19:00:02 +00:00
Joerg Mueller
2f516f46da Fix for [#27349] Sequencer: Meta Strips plays unavailable audio
Hopefully at least... Sequencer code is like <insert name of random ancient language that nobody knows anymore here>.
2012-02-13 17:31:33 +00:00
Sergey Sharybin
840ffba82c Fixed copy-paste of sound strips in sequencer.
Copy operator used to remove scene_sound from strips, but Paste operator didn't
restore which lead to total silence of newly added strips.
2012-02-13 17:29:10 +00:00
Howard Trickey
cf0967bfe6 Code cleanup: add and use knife list utility functions
In preparation for code in progress that uses lists
allocated out of the knife arena.  This also makes
existing code more readable and understandable IMO.

Also removed an #if'd out function that will not
ever be needed.
2012-02-13 14:45:17 +00:00
Campbell Barton
cde2f11244 new bmesh tool - limited dissolve.
This is a kind of simplification/cleanup tool which joins adjacent faces and edges based on the angle.

I've written this as an exercise (since I havnt written a bmesh operator before), and because quite a few users were asking for the dissolve operator to be extended, but I think this kind of functionality needs its own operator.

access from specials menu and mesh menu.

notes
* this exposed a bug in angle_v3v3v3(). will merge fix into trunk after release.
* added utility function BM_vert_edge_angle(), to get the angle between 2 connecting edges of a vert.
2012-02-13 14:37:07 +00:00
Sergey Sharybin
32c4ade29c Fix #30159: Boolean modifier creating non-concave faces
Issue was caused by merging triangles into quads policy which used to think
triangulation of non-planar/non-concave quads happens by 1-3 diagonal which
isn't actually correct in some OpenGL implementations.

Added check for non-concave faces when merging triangles. It will work fine if
original faces are flat. In case if original faces aren't flat this check might
fail and triangulate face when it's not actually needed or merge triangles in
a way which leads to OpenGL artifacts.
2012-02-13 13:23:23 +00:00