Commit Graph

66005 Commits

Author SHA1 Message Date
Sergey Sharybin
fedb95da23 Tomato: fixed incorrect auto-scale calculation for 2d stabilization 2012-02-16 13:14:28 +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
Jens Verwiebe
42e50719df ffmpeg: take back 44142, conditional was wrong 2012-02-16 11:52: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
Jens Verwiebe
f047d90a0e ffmpeg: only suppress loopfilter for .mov ( compatibility ), but keep for .avi (quality ) 2012-02-16 08:48:28 +00:00
Sergey Sharybin
da69173269 Tomato: fix for missing cache invalidation when disabling/enabling channels for stabilized shot 2012-02-16 07:45:01 +00:00
Sergey Sharybin
b5628b45ff Merging r44129 through r44139 from trunk into soc-2011-tomato 2012-02-16 07:11:50 +00:00
Campbell Barton
30dddb9840 fix for replacing a generated image with a file, the image would stay generated.
not a show-stopper but confusing.
2012-02-16 04:21:40 +00:00
Campbell Barton
a0feea1fc0 fix [#30201] bpy_extras.image_utils.load_image always returns placeholder
in existing addons this only effects OBJ import.

interestingly even though this is a bug (in that its returning a placeholder when it should load the image), since the placeholder points to the correct path, the image will load correctly when refreshed, so the bug's not too bad.
2012-02-16 04:08:52 +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
Sergey Sharybin
9251d64e2b Tomato: fixed incorrect behavior of textures buffer used in MCE together with 2d stabilization. 2012-02-15 18:11:10 +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
Sergey Sharybin
bd249c3bff Camera tracking: animation datablock for MovieClip
Added AnimData block to MovieClip datablock which allows to animate different
properties in clip. Currently supports animation of stabilization influence only.
2012-02-15 16:06:48 +00:00
Sergey Sharybin
7985ae700c Merging r44109 through r44128 from trunk into soc-2011-tomato 2012-02-15 16:04:57 +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
Sergey Sharybin
4eb006f6f5 Merging r44070 through r44108 from trunk into soc-2011-tomato 2012-02-14 15:19:49 +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