Commit Graph

47594 Commits

Author SHA1 Message Date
Sergey Sharybin
122cb86d15 Sequencer: remove strip's color balance in favor of modifiers
Having two ways to control color balance now seems a bit overkill
and not clear.

Removed old Color Balance settings from the interface and logic,
added versioning code to convert this settings to modifier.

Unfortunately, since color balance was a pointer, it's not actually
possible to preserve compatibility of old files saved in new
blender and opened back in old blender.

Hopefully there's no regressions :)
2012-09-04 13:37:53 +00:00
Brecht Van Lommel
adea12cb01 Cycles: merge of changes from tomato branch.
Regular rendering now works tiled, and supports save buffers to save memory
during render and cache render results.

Brick texture node by Thomas.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture

Image texture Blended Box Mapping.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture
http://mango.blender.org/production/blended_box/

Various bug fixes by Sergey and Campbell.
* Fix for reading freed memory in some node setups.
* Fix incorrect memory read when synchronizing mesh motion.
* Fix crash appearing when direct light usage is different on different layers.
* Fix for vector pass gives wrong result in some circumstances.
* Fix for wrong resolution used for rendering Render Layer node.
* Option to cancel rendering when doing initial synchronization.
* No more texture limit when using CPU render.
* Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
Sergey Sharybin
68563134d4 Mango request: display sliders for current point in curve mapping
--
svn merge -r49893:49894 ^/branches/soc-2011-tomato
2012-09-04 12:40:47 +00:00
Sergey Sharybin
8dff07ef9a Color Management: fix for color sample information line
- Color managed RGB values wouldn't be displayed anymore for
  byte images (which are currently unsupported to be managed).

- Color rectangle would now be color managed

- Sequencer was passing non-linear float to information line,
  now it'll pass linear float.
2012-09-04 12:32:32 +00:00
Sergey Sharybin
1508f62169 Color Management: fix for view/display settings validation
It was a misusage of LinkData and actual data leading to wrong
string comparsion and possible wrong memory access.
2012-09-04 12:32:18 +00:00
Sergey Sharybin
3b9c3604c6 Color Management: remove hardcoded ACES ODT tonemap
This tonemap was added as a temporary option only and if it'll be
needed again, it'll be better to implement is as either a spline
in OCIO or as a film response curve (as some of such curves were
added as a presets for RGB curves in Mango production SVN).

Also revert changes made to IMB_buffer_byte_from_float since it's
not actually needed anymore and makes it's clearer changes against
trunk.
2012-09-04 12:32:12 +00:00
Jeroen Bakker
d4be0ec9fb * there is a tiny memory leak. I think it happens when you quit blenden
during a WM_draw. tiny is max 8* size of pointer and it is maintained at
that size. So no worries there.
 * cleanup some code to be certain that deinitialization happens
correctly.
2012-09-04 11:08:47 +00:00
Sergey Sharybin
e15f352831 Merging r50265 through r50373 from trunk into soc-2011-tomato 2012-09-04 09:06:37 +00:00
Campbell Barton
3804b2d2ba fix [#31856] movieclips.load(filepath=None) or value crash Blender
workaround for python bug/inconsistency
2012-09-04 05:36:07 +00:00
Campbell Barton
914d389713 fix for building without python, also rework python-main-loop control in the BGE to not use RNA (use lower level BKE/BLI funcs instead) 2012-09-04 03:26:12 +00:00
Mitchell Stokes
e5a1b1b526 Fix for [#32469] "standalone blenderplayer no longer starts in lastest build" reported by narutocanada. It looks like the Hive commit (r50310) didn't take changes from r49998 into account, so it was still relying on Ghost events to push the engine along instead of calling app->EngineNextFrame(). 2012-09-04 02:33:37 +00:00
Campbell Barton
a71b160184 fix for building on msvc2008 (also style cleanup) 2012-09-04 01:23:50 +00:00
Campbell Barton
7283709a40 code cleanup: curve path calculation 2012-09-03 22:53:34 +00:00
Campbell Barton
aaafa0c2fe code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later. 2012-09-03 22:04:14 +00:00
Gaia Clary
192935eb04 fix:32348 Collada yfov to xfov conversion fo camera settings 2012-09-03 17:54:04 +00:00
Sergey Sharybin
e58548706f Fix regression introduced in recent jobs system refactoring
Fluid simulation job progress wasn't displayed anymore.
2012-09-03 16:05:37 +00:00
Howard Trickey
5c2d9022d9 Fix knife bug #30764, failure to cut sometimes.
Two bugs: first, the point-in-face function had a bug that made it fail for the xz or yz planes.
Second, in ortho mode, simultaneous linehits need careful sorting.
Also, in orth mode it is somewhat random whether the edges exactly behind the front ones are reported 'hit' by bvh tree, so put in code to prevent cuts along the parallel-to-view faces when not in cut-through mode.
2012-09-03 14:37:34 +00:00
Sergey Sharybin
eff97a82f8 Fix for compositor always cacheing frames when using Movie Clip input node
Issue was caused by getting image from compositor node conversion code,
now it'll check whether rendering happens and if so, frame wouldn't be
stored in the cache.

This possible fixes #32465: Memory leak when rendering
2012-09-03 14:26:53 +00:00
Sergey Sharybin
1f64aecb30 Fix for usage of un-initialized memory.
Checked by Brecht when were in Blender Institute.

Discovered when was looking into #32296: Node Texture - Node Material - GLSL Viewport rendering issue
2012-09-03 13:17:21 +00:00
Brecht Van Lommel
d6ec4b874b Compositor: initialize OpenCL only when the option is enabled. This eliminates
error prints or even crashes for poor OpenCL implementations when not using it.
2012-09-03 12:52:21 +00:00
Sergey Sharybin
dde5ccb61f Fix for logging FFmpeg messages 2012-09-03 12:01:00 +00:00
Brecht Van Lommel
1cb9b1ddf3 Fix #32461: adjusting brush strength with shift+F in image editor would show
the cursor too big when zoomed in. Only the size adjusment needs to follow the
zoom level of the editor, others are fixed size.
2012-09-03 11:55:30 +00:00
Lukas Toenne
c0a3657e7a Added library linking for cycles_kernel_osl to OSL libraries and added cycles_kernel_osl to the list of blender libs in creator. 2012-09-03 11:38:18 +00:00
Brecht Van Lommel
acebddeb23 Fix #32468: 3d view texture paint mode did not show uv layout in image editor. 2012-09-03 11:26:04 +00:00
Campbell Barton
737f2e8be8 fix [#31694] Circle Selection is ignored within face selection in texture paint mode 2012-09-03 10:39:15 +00:00
Campbell Barton
95f7264014 code cleanup: split out defines in BKE_utildefines.h into BLO_blend_defs.h and ui defines in interface_intern.h 2012-09-03 10:12:25 +00:00
Sergey Sharybin
86ff6cc346 Color Management: fix compilation error when OCIO is disabled 2012-09-03 10:08:55 +00:00
Campbell Barton
b8b5bf7dcd array functions for endian switching. 2012-09-03 09:03:25 +00:00
Campbell Barton
d248f94cf8 add endian switch functions to replace macros SWITCH_INT/LONG/SHORT, with BLI_endian_switch_int32/int64/float/double... 2012-09-03 07:37:38 +00:00
Campbell Barton
ca6fa937d4 style cleanup 2012-09-03 05:36:47 +00:00
Campbell Barton
56534ecdcb style cleanup: also add debugging print function for derived mesh DM_debug_print_cdlayers() 2012-09-03 02:41:12 +00:00
Campbell Barton
892cfa4285 fix [#32434] Copy-Paste Tracks causes Blender to freeze/crash on second use. 2012-09-03 01:05:04 +00:00
Tamito Kajiyama
a5f8298ea5 Experimental fix for incorrect view edge visibility.
The problem is that the visibility of view edges in the view map may be incorrect.
The main cause of this issue is that view edges are constructed from a series of FEdges
without testing the visibility of the FEdges being concatenated.  Later view edges
are split into pieces if two view edges intersect in the 2D image coordinate system.
After that the visibility of the view edges is computed by taking account of occluding
faces in the 3D scene.  In many cases this procedure results in correct line visibility,
but not always (that is the problem).

A simple solution experimentally implemented here is not to chain FEdges at all.
Instead view edges are constructed from at most one FEdge now.  This solution is only
applied to sharp FEdges (roughly corresponding to edges in the input mesh data; specifically,
silhouette, crease, border, edge mark, contour, external contour, and material boundary).

A better solution is to reorder the three steps of view edges construction mentioned above,
i.e., first splitting FEdges at 2D intersection, computing the visibility of the FEdges,
then concatenating them to build view edges.  This solution is left for future work for now.
2012-09-03 01:01:50 +00:00
Campbell Barton
bd53226b5c fix [#32423] Extrude crash
mistake in r50086 caused the crash (killing the wrong vertex)
2012-09-03 00:30:55 +00:00
Campbell Barton
dbdd1bb4f2 remove vertex groups from a mesh or lattice when this there are no remaining vertex groups. This was dont in edit-mode but not object-mode. 2012-09-03 00:02:13 +00:00
Sv. Lockal
ebbfc46bea Use function pointers instead of hard-coded english button names in color picker block.
This solves the problem with es/ru translations of color picker block reported by Gabriel Gazzán in Bf-translations-dev.
2012-09-02 13:36:33 +00:00
Benoit Bolsee
53f343edd7 ..\commmit_hive.txt 2012-09-01 21:23:05 +00:00
Thomas Dinges
99abcb8e45 Possible fix for [#32462] blender cannot load bmp files (Windows OS).
* Typo in the CHECK_HEADER_FIELD macro. 

Patch by kjym3 in IRC, thanks!
2012-08-31 19:57:03 +00:00
Lukas Toenne
9e3fa15d4b Added a bunch of additional particle state attributes to the Cycles particle info node:
* Location: Basically the same as the location from Object Info node for object instances on particles, but in principle there could be additional offsets for dupli objects, so included for completeness.
* Size: Single float scale of the particle. Also directly translates to object scale for current dupli objects, but handy to have as a single float to start with instead of a scale vector (currently not even exposed in Object Info).
* Rotation: This is a quaternion, which are not yet supported by Cycles nodes. The float4 is copied to internal Cycles data and stored in the particles texture data, but the node doesn't have a socket for it yet and the data is not yet written to the stack. Code is just commented out so could be enabled quickly if/when rotation support is added to cycles.
* Velocity: Linear velocity vector of particles.
* Angular Velocity: Angular velocity around principle axes.

The texture data is currently packed tightly into the particles texture, which saves a few bytes, but requires an additional texture lookup for some vector attributes which spread over two float4s. Could also add another float4 to particle size to avoid this.
2012-08-31 19:38:59 +00:00
Brecht Van Lommel
5ecff7a240 Fix #32329: inset produces incorrect result, epsilon was too small to handle
floating point error.
2012-08-31 16:10:13 +00:00
Brecht Van Lommel
fe9b1c644f Fix #32458: changing UV image in image editor not working when the active face
was not selected. Now changed it so that the active face must also have its
UVs shown in the image editor to be used as the source of the image shown.
2012-08-31 15:01:40 +00:00
Brecht Van Lommel
78c181fafc Fix part of #32376: mirror vertex groups with flip group names did not keep
the same vertex group active.
2012-08-31 13:43:56 +00:00
Brecht Van Lommel
6b2aa6f863 Fix #32408: image editor does not show paint brush circle on loading a .blend
file that has paint mode enabled.
2012-08-31 13:04:03 +00:00
Brecht Van Lommel
533192013f Fix #32447: mouse selection in uv editor is now no longer registerd as last
operator, same as 3d view.
2012-08-31 12:08:08 +00:00
Brecht Van Lommel
0b4dfa1fcb Fix #32450: edge slide with multiple loops selected could move some loops
in the wrong direction.
2012-08-31 12:08:04 +00:00
Thomas Dinges
6acb586c95 Cycles / Brick Texture:
* Added GLSL stub for the Brick texture, fixes an error in the console when switching to Material Shading in the 3D View.
2012-08-30 20:45:01 +00:00
Brecht Van Lommel
fd22a5603a Fix #32418: color copy/paste between gamma and linear color buttons gave wrong
results, now it does the conversion.
2012-08-30 17:55:21 +00:00
Brecht Van Lommel
b25ca62f20 Fix #32404: GLSL normal maps using float images were incorrectly getting
color managed.
2012-08-30 17:42:04 +00:00
Brecht Van Lommel
f9bccc069c Fix #32405: snapping in UV editor does not work if snapping in 3D view is set
to "snap to face" with "project individual ..." enabled.
2012-08-30 17:41:59 +00:00
Joshua Leung
c4622c405e Bugfix [#32249] Groups in Dopesheet and Action editor don't get updated after
bone renaming

* Renaming F-Curves now checks if the corresponding F-Curve's group can also be
renamed accordingly.
* Changed the RNA updates for bone renaming so that they properly update the
channel lists
2012-08-30 15:06:13 +00:00