8 years agosvn merge ^/trunk/blender -r49573:49601
Campbell Barton [Mon, 6 Aug 2012 09:33:43 +0000 (09:33 +0000)]
svn merge ^/trunk/blender -r49573:49601

8 years agonode transform for frames was broken since the frames locx, locy are used as offsets...
Campbell Barton [Mon, 6 Aug 2012 09:08:24 +0000 (09:08 +0000)]
node transform for frames was broken since the frames locx, locy are used as offsets, now node transform uses node ccenters (works nicer for regular nodes too).

8 years agoprevent copy/paste from incompatible types (compo -> material for eg) - would crash...
Campbell Barton [Mon, 6 Aug 2012 08:41:45 +0000 (08:41 +0000)]
prevent copy/paste from incompatible types (compo -> material for eg) - would crash instantly.

8 years agofix for node clipboard leak on exit, also use blenders convention for function naming...
Campbell Barton [Mon, 6 Aug 2012 08:25:24 +0000 (08:25 +0000)]
fix for node clipboard leak on exit, also use blenders convention for function naming with BKE clipboard funcs.

8 years agofix for building in debug mode.
Campbell Barton [Mon, 6 Aug 2012 08:01:20 +0000 (08:01 +0000)]
fix for building in debug mode.

8 years agoFix for [#32054] "Animation break after resuming scene" reported by Andreas Esau...
Mitchell Stokes [Mon, 6 Aug 2012 00:53:26 +0000 (00:53 +0000)]
Fix for [#32054] "Animation break after resuming scene" reported by Andreas Esau (ndee). The action's timing was getting messed up which resulted in negative local frames, which were being counted as "done."

8 years agoAvoid recursion in skin modifier's edge matrix calculations
Nicholas Bishop [Sun, 5 Aug 2012 23:29:50 +0000 (23:29 +0000)]
Avoid recursion in skin modifier's edge matrix calculations

This is a potential fix for bug [#32263] Instant Crash with Skin

8 years agoAdd an array-based generic stack structure to blenlib
Nicholas Bishop [Sun, 5 Aug 2012 23:29:43 +0000 (23:29 +0000)]
Add an array-based generic stack structure to blenlib

Very simple stack with homogeneous contents. Provides push, pop, and
is-empty operations.

8 years agoFix for [#32270] "Removing a Character object from the scene causes a crash." reporte...
Mitchell Stokes [Sun, 5 Aug 2012 22:31:55 +0000 (22:31 +0000)]
Fix for [#32270] "Removing a Character object from the scene causes a crash." reported by me. The character's action wasn't being removed from the dynamics world when the character controller was.

8 years agoCOLLADA: report #32237 fixed Camera exporter and Importer to use correct camera...
Gaia Clary [Sun, 5 Aug 2012 21:35:09 +0000 (21:35 +0000)]
COLLADA: report #32237  fixed Camera exporter and Importer to use correct camera animation data

8 years agofix for transforming parented nodes, the node would check its parent was not transfor...
Campbell Barton [Sun, 5 Aug 2012 21:06:56 +0000 (21:06 +0000)]
fix for transforming parented nodes, the node would check its parent was not transformed, but in fact its parents parent could still be getting transformed still, also, the order of initializing transform data made this check unreliable.

fix for mingw broke from one of my own commits, changing header order fixes.

8 years agofix for crash when moving frames about in the node space, was possible to move a...
Campbell Barton [Sun, 5 Aug 2012 20:40:26 +0000 (20:40 +0000)]
fix for crash when moving frames about in the node space, was possible to move a node into its own child frame (causing recursive parent loop).

also some minor code cleanup.

8 years agofix for transforming parented nodes (parent relative offset wasn't taken into account)
Campbell Barton [Sun, 5 Aug 2012 20:16:14 +0000 (20:16 +0000)]
fix for transforming parented nodes (parent relative offset wasn't taken into account)

8 years agofix for crash when mask editing if there is an active point but no active spline.
Campbell Barton [Sun, 5 Aug 2012 18:12:34 +0000 (18:12 +0000)]
fix for crash when mask editing if there is an active point but no active spline.

8 years agoTomato Cycles: fix regression since rev49535
Sergey Sharybin [Sun, 5 Aug 2012 17:38:44 +0000 (17:38 +0000)]
Tomato Cycles: fix regression since rev49535

Wrong sample number was reporting in viewport rendering.

8 years agouse define for 0.375 = GLA_PIXEL_OFS, used all over the interface.
Campbell Barton [Sun, 5 Aug 2012 17:27:52 +0000 (17:27 +0000)]
use define for 0.375 = GLA_PIXEL_OFS, used all over the interface.
also use M_SQRT1_2 in math_rotation.c

8 years agoTomato Cycles: fix for vector pass gives wrong result in some circumstances
Sergey Sharybin [Sun, 5 Aug 2012 17:24:10 +0000 (17:24 +0000)]
Tomato Cycles: fix for vector pass gives wrong result in some circumstances

Issue was caused by wrong camera motion stored in device in cases
when first render layer does not have vector pass enabled.

Solved by forcing device camera update in cases when scene's motion
changed since previous device camera update.

8 years agocode cleanup: minor edit - replace memset() with zero initialization, remove unneeded...
Campbell Barton [Sun, 5 Aug 2012 15:04:10 +0000 (15:04 +0000)]
code cleanup: minor edit - replace memset() with zero initialization, remove unneeded NULL check in ibuf_sample()

8 years agocode cleanup: remove redundant calls to CTX_data_main()
Campbell Barton [Sun, 5 Aug 2012 14:11:51 +0000 (14:11 +0000)]
code cleanup: remove redundant calls to CTX_data_main()

8 years agofix uninitialized memory use for mask feather points, also remove some double promotions.
Campbell Barton [Sun, 5 Aug 2012 13:26:39 +0000 (13:26 +0000)]
fix uninitialized memory use for mask feather points, also remove some double promotions.

8 years agoMerging r49534 through r49573 from trunk into soc-2011-tomato
Sergey Sharybin [Sun, 5 Aug 2012 12:54:39 +0000 (12:54 +0000)]
Merging r49534 through r49573 from trunk into soc-2011-tomato

8 years agoCOLLADA: #29058 Fixed crash when illegal reference to non existing camera object...
Gaia Clary [Sun, 5 Aug 2012 10:23:34 +0000 (10:23 +0000)]
COLLADA: #29058 Fixed crash when illegal reference to non existing camera object is found. And report a warning to the console)

8 years agoFix for keying screen incorrect memory write when some of tracks are disabled.
Sergey Sharybin [Sun, 5 Aug 2012 09:31:48 +0000 (09:31 +0000)]
Fix for keying screen incorrect memory write when some of tracks are disabled.

8 years agoFix [#32260] 'Select Sharp Edges' works vice versa
Bastien Montagne [Sun, 5 Aug 2012 07:50:51 +0000 (07:50 +0000)]
Fix [#32260] 'Select Sharp Edges' works vice versa

We want to select edges sharpest than the given threshold, i.e. which faces’s angle is below the limit! Looks like BMesh switched this somehow...

8 years agoBGE: Fixing a NULL pointer exception caused by calling KX_Scene.active_camera when...
Mitchell Stokes [Sun, 5 Aug 2012 07:01:08 +0000 (07:01 +0000)]
BGE: Fixing a NULL pointer exception caused by calling KX_Scene.active_camera when there is no camera in the scene.

8 years agoCOLLADA: fix for #32251. This seems to be compliant to the Collada 1.4.1 specification.
Gaia Clary [Sat, 4 Aug 2012 22:18:56 +0000 (22:18 +0000)]
COLLADA: fix for #32251. This seems to be compliant to the Collada 1.4.1 specification.

8 years agoCOLLADA: added initial support for ymag and yfov in importer. fixes issue #32237
Gaia Clary [Sat, 4 Aug 2012 21:25:19 +0000 (21:25 +0000)]
COLLADA: added initial support for ymag and yfov in importer. fixes issue #32237

8 years agofix a glitch where overlapping feathering could give random bad pixels, this was...
Campbell Barton [Sat, 4 Aug 2012 21:04:26 +0000 (21:04 +0000)]
fix a glitch where overlapping feathering could give random bad pixels, this was caused by feather edge going in a different direction to the mask edge - creating bowtie quads.

8 years agoWindows MSVC libraries:
Thomas Dinges [Sat, 4 Aug 2012 20:25:04 +0000 (20:25 +0000)]
Windows MSVC libraries:
* Some refactor, use set_lib_path macro again, which simplifies the code a bit.

8 years agoresolve some issues with curve resolution calculaction
Campbell Barton [Sat, 4 Aug 2012 20:17:22 +0000 (20:17 +0000)]
resolve some issues with curve resolution calculaction
- resolution could become so high that it would wrap around  to a negative number, now check for small numbers before doing float division.
- resolution was being calculated in some cases when it already met the clamp value - now this is skipped.

8 years agostyle cleanup
Campbell Barton [Sat, 4 Aug 2012 19:34:38 +0000 (19:34 +0000)]
style cleanup

8 years agostyle cleanup
Campbell Barton [Sat, 4 Aug 2012 12:54:27 +0000 (12:54 +0000)]
style cleanup

8 years agoCmake / Windows Libraries:
Thomas Dinges [Sat, 4 Aug 2012 12:43:45 +0000 (12:43 +0000)]
Cmake / Windows Libraries:
* Some more fixes for OpenEXR, works now (tested with cv2008 x64 and x32)
* Some more changes to have libs in lib/win*/libname/vc2010 folder. Commit to libs itself to change that will follow.

8 years agostyle cleanup
Campbell Barton [Sat, 4 Aug 2012 12:30:16 +0000 (12:30 +0000)]
style cleanup

8 years agoCode cleanup:
Thomas Dinges [Sat, 4 Aug 2012 11:42:38 +0000 (11:42 +0000)]
Code cleanup:
* Remove BSP_GhostTest, not used and working for ages, approved by Sergey.

8 years agoRevert part of r49504 by Genscher:
Thomas Dinges [Sat, 4 Aug 2012 11:39:16 +0000 (11:39 +0000)]
Revert part of r49504 by Genscher:
* MSVC Paths were put into the MinGW block, so Mingw did not work anymore.
* Also fix paths for vc2010 libs now, so they should work now with cmake.

8 years agoCamera tracking presets
Sergey Sharybin [Sat, 4 Aug 2012 10:47:31 +0000 (10:47 +0000)]
Camera tracking presets

- Fix for copy default settings from active track operator
- Add meaningful tracking presets

API changes:

- Added parameter exact to Marker.find_frame, so now it's
  possible to get estimated marker

- Added Marker.pattern_bound_box to get pattern's bound box

8 years agoTomato Cycles: minor code cleanup
Sergey Sharybin [Sat, 4 Aug 2012 09:13:52 +0000 (09:13 +0000)]
Tomato Cycles: minor code cleanup

Move center tile acquiring code into own function. Should be
easier for time being when we'll want to support other tile
render orders.

Also now there should be a single bucket growing from center
when multi-GPU is used. Can't test this here tho.

8 years agocode cleanup: use camelcase for struct name.
Campbell Barton [Fri, 3 Aug 2012 23:44:50 +0000 (23:44 +0000)]
code cleanup: use camelcase for struct name.

8 years agodont re-combute composite nodes when knife and add-socket operators don't add any...
Campbell Barton [Fri, 3 Aug 2012 23:44:19 +0000 (23:44 +0000)]
dont re-combute composite nodes when knife and add-socket operators don't add any links.

8 years agoallow editing masks in an image space when there is no image.
Campbell Barton [Fri, 3 Aug 2012 22:33:45 +0000 (22:33 +0000)]
allow editing masks in an image space when there is no image.
also simplify image listener.

8 years agocode cleanup:
Campbell Barton [Fri, 3 Aug 2012 22:12:57 +0000 (22:12 +0000)]
code cleanup:
- replace (strcmp(vfont->name, FO_BUILTIN_NAME) == 0)  with  (BKE_vfont_is_builtin(vfont)).
- reduce some double promotions.

8 years agofullscreen mask editing now works in the image space over a viewer node.
Campbell Barton [Fri, 3 Aug 2012 20:56:04 +0000 (20:56 +0000)]
fullscreen mask editing now works in the image space over a viewer node.

8 years agomask transforming when a mesh object was in editmode (but had no UV's), failed
Campbell Barton [Fri, 3 Aug 2012 20:12:49 +0000 (20:12 +0000)]
mask transforming when a mesh object was in editmode (but had no UV's), failed

8 years agochange blender minversion because of BMesh data.
Campbell Barton [Fri, 3 Aug 2012 15:23:17 +0000 (15:23 +0000)]
change blender minversion because of BMesh data.

8 years agoTomato Cycles: internal cleanup of tile-based integrator
Sergey Sharybin [Fri, 3 Aug 2012 15:18:42 +0000 (15:18 +0000)]
Tomato Cycles: internal cleanup of tile-based integrator

This commit solves couple of issues appeared with new integrator:

- Render job progress bar is now shows progress based on number of
  rendered tiles. This is the same as Blender Internal does.

  This still requires some further thoughts because for GPU it's
  better to use single tile and in this case progress bar should
  be based on number of rendered samples.

- Removes "global" sample counter from progress descriptor. There's
  no more global-being sample which makes sense.

  This counter was replaced with tile counter.

- Use proper sample number when copying render buffer to blender.
  It used to be final sample number used which lead to tiles
  appearing from complete dark to normal brightness as they're
  being rendered. Now tile would be displayed with proper
  brightness starting from the very first sample.

  Use sample counter stored in render tile descriptor and pass
  it to update / write callbacks.

This was tested on CPU and GPU CUDA rendering.

Additional change:

  OpenCL rendering now should be cancellable before it finished
  rendering all the samples (the same change as for CPU/CUDA from
  a while ago).

This part of commit wasn't actually tested, would do it later.

8 years agosvn merge ^/trunk/blender -r49531:49533
Campbell Barton [Fri, 3 Aug 2012 15:05:20 +0000 (15:05 +0000)]
svn merge ^/trunk/blender -r49531:49533

8 years agofix/edits to vector font handling
Campbell Barton [Fri, 3 Aug 2012 15:03:40 +0000 (15:03 +0000)]
fix/edits to vector font handling
- don't overwrite the font path with "<builtin>" when the font file cant be found, it caused bad problems when loading files on someone elses systems when paths couldn't be found blender would silently clobber paths (tsk tsk).

- when fonts are freed their temp data is now freed too.

- assigning a new filepath to a font now refreshes the object data.

8 years agosvn merge ^/trunk/blender -r49520:49531
Campbell Barton [Fri, 3 Aug 2012 13:29:33 +0000 (13:29 +0000)]
svn merge ^/trunk/blender -r49520:49531

8 years agoadd option to link fonts in make links menu.
Campbell Barton [Fri, 3 Aug 2012 13:27:58 +0000 (13:27 +0000)]
add option to link fonts in make links menu.

8 years agofont filepath wasn't editable from python.
Campbell Barton [Fri, 3 Aug 2012 13:03:53 +0000 (13:03 +0000)]
font filepath wasn't editable from python.

8 years agoDO not draw active outline for collapsed nodes when they're not selected
Sergey Sharybin [Fri, 3 Aug 2012 11:39:34 +0000 (11:39 +0000)]
DO not draw active outline for collapsed nodes when they're not selected

Also made corrections to currently unused code

8 years agoCorrection top previous commit: tiles were counted in opposite way
Sergey Sharybin [Fri, 3 Aug 2012 11:13:38 +0000 (11:13 +0000)]
Correction top previous commit: tiles were counted in opposite way

8 years agoTomato Cycles: fix own regression in currently rendering tile status
Sergey Sharybin [Fri, 3 Aug 2012 10:55:33 +0000 (10:55 +0000)]
Tomato Cycles: fix own regression in currently rendering tile status

8 years agoFix for node placement when copying to/pasting from clipboard. Child node location...
Lukas Toenne [Fri, 3 Aug 2012 10:51:29 +0000 (10:51 +0000)]
Fix for node placement when copying to/pasting from clipboard. Child node location is always relative to parent nodes (if the parent is also copied) and must not be offset. Also takes the offset of the edited node group in the editor into account now.

8 years agoTomato Cycles: fix wrong center coordinate when using multi-device configurations
Sergey Sharybin [Fri, 3 Aug 2012 10:42:21 +0000 (10:42 +0000)]
Tomato Cycles: fix wrong center coordinate when using multi-device configurations

8 years agostyle cleanup: compositor
Campbell Barton [Fri, 3 Aug 2012 10:19:13 +0000 (10:19 +0000)]
style cleanup: compositor

8 years agoFix for node clipboard copy operator for Frame nodes. Was redirecting the parent...
Lukas Toenne [Fri, 3 Aug 2012 10:18:52 +0000 (10:18 +0000)]
Fix for node clipboard copy operator for Frame nodes. Was redirecting the parent pointer of the original instead of the copied nodes.

8 years agosvn merge ^/trunk/blender -r49518:49520
Campbell Barton [Fri, 3 Aug 2012 09:53:24 +0000 (09:53 +0000)]
svn merge ^/trunk/blender -r49518:49520

8 years agofix for bokeh blur using uninitialized memory - it would cause some tiles not to...
Campbell Barton [Fri, 3 Aug 2012 09:51:10 +0000 (09:51 +0000)]
fix for bokeh blur using uninitialized memory - it would cause some tiles not to be blurred.

was in fact a bug in MemoryBuffer::getMaximumValue

8 years agoMerging r49499 through r49518 from trunk into soc-2011-tomato
Sergey Sharybin [Fri, 3 Aug 2012 09:08:40 +0000 (09:08 +0000)]
Merging r49499 through r49518 from trunk into soc-2011-tomato

8 years agocode cleanup: remove unused includes
Campbell Barton [Thu, 2 Aug 2012 23:03:16 +0000 (23:03 +0000)]
code cleanup: remove unused includes

8 years agoTypo fix, sorry. :/
Thomas Dinges [Thu, 2 Aug 2012 22:07:10 +0000 (22:07 +0000)]
Typo fix, sorry. :/

8 years agocode cleanup: move node background image operators into node_view.c
Campbell Barton [Thu, 2 Aug 2012 21:52:09 +0000 (21:52 +0000)]
code cleanup: move node background image operators into node_view.c

8 years agoCode cleanup:
Thomas Dinges [Thu, 2 Aug 2012 21:50:49 +0000 (21:50 +0000)]
Code cleanup:
* Removed some remaining defines for AVI_CODEC (from the old 2.4x days and windows only), because only some defines were left, no underlying code to bring back, so just as good remove for good.

8 years agorename node_state.c --> node_view.c
Campbell Barton [Thu, 2 Aug 2012 21:36:33 +0000 (21:36 +0000)]
rename node_state.c --> node_view.c

8 years agocode cleanup: double promotion warnings
Campbell Barton [Thu, 2 Aug 2012 21:17:12 +0000 (21:17 +0000)]
code cleanup: double promotion warnings

8 years agoRemove old boolean operation module
Sergey Sharybin [Thu, 2 Aug 2012 16:42:30 +0000 (16:42 +0000)]
Remove old boolean operation module

Carve proved it's a way to go, so the time have came to get rid of old
boolean operation module which isn't used anymore.

Still kept BOP interface but move it to BSP module. At some point it
could be cleaned up further (like perhaps removed extra abstraction
level or so) but would be nice to combine such a refactor with making
BSP aware of NGons.

Tested on linux using both cmake and scons, possible regressions on
windows/osx. Would check windoes build just after commit.

8 years agofix for crash when node groups loose their ID pointer references (when linked libs...
Campbell Barton [Thu, 2 Aug 2012 16:33:38 +0000 (16:33 +0000)]
fix for crash when node groups loose their ID pointer references (when linked libs don't load)

8 years agoNode selection: make node active before it could be unselected by extending
Sergey Sharybin [Thu, 2 Aug 2012 16:01:05 +0000 (16:01 +0000)]
Node selection: make node active before it could be unselected by extending
selection, which matches behavior of all other areas in blender.

8 years agoFix #31753: GLSL not updated after deleting lights in multiple-scene setting
Sergey Sharybin [Thu, 2 Aug 2012 15:49:20 +0000 (15:49 +0000)]
Fix #31753: GLSL not updated after deleting lights in multiple-scene setting

8 years agoOpenEXR: Enable again for MSVC 2010
Daniel Genrich [Thu, 2 Aug 2012 14:21:25 +0000 (14:21 +0000)]
OpenEXR: Enable again for MSVC 2010

8 years agoTomato Cycles: experimental option to cancel rendering when doing initial synchronization
Sergey Sharybin [Thu, 2 Aug 2012 14:16:37 +0000 (14:16 +0000)]
Tomato Cycles: experimental option to cancel rendering when doing initial synchronization

This required wrapping create and update pytohn callbacks as  into begin/end
allow threading macroses. From quick tests this seems to be stable enough,
but more tests would be needed before considering this stable.

8 years agocode cleanup: remove redundant float casts
Campbell Barton [Thu, 2 Aug 2012 11:33:21 +0000 (11:33 +0000)]
code cleanup: remove redundant float casts

8 years agosvn merge ^/trunk/blender -r49478:49498
Campbell Barton [Thu, 2 Aug 2012 11:29:32 +0000 (11:29 +0000)]
svn merge ^/trunk/blender -r49478:49498

8 years agofix for own regression in avi header writing.
Campbell Barton [Thu, 2 Aug 2012 11:25:04 +0000 (11:25 +0000)]
fix for own regression in avi header writing.

8 years agoimprove not very helpful error message.
Campbell Barton [Thu, 2 Aug 2012 10:42:40 +0000 (10:42 +0000)]
improve not very helpful error message.

8 years agoFix #32236: unstable z-buffer or z combine composition node
Sergey Sharybin [Thu, 2 Aug 2012 10:20:14 +0000 (10:20 +0000)]
Fix #32236: unstable z-buffer or z combine composition node

8 years agoClipboard feature for nodes. With the Copy operator a copy of all selected nodes...
Lukas Toenne [Thu, 2 Aug 2012 09:52:37 +0000 (09:52 +0000)]
Clipboard feature for nodes. With the Copy operator a copy of all selected nodes and links between them is stored in an offscreen list (not in the library). The Paste operator then in turn copies these into the active node tree in the editor.

Currently does not support copying of animation data. This would require copying of individual fcurves etc. between data block, which is not implemented yet.

Also it is currently possible to circumvent some constraints of the nodes, in particular for node groups (e.g. no groups inside groups, render layer not inside groups).

8 years agoBuildbot: package softwaregl scripts for buildbot builds
Sergey Sharybin [Thu, 2 Aug 2012 08:57:18 +0000 (08:57 +0000)]
Buildbot: package softwaregl scripts for buildbot builds

Uses the same libs as release environment does

8 years agocode cleanup: headers
Campbell Barton [Wed, 1 Aug 2012 20:39:14 +0000 (20:39 +0000)]
code cleanup: headers

8 years agoBugfix: High resolution "exploded" when using uneven resolutions, sometimes with...
Daniel Genrich [Wed, 1 Aug 2012 20:29:37 +0000 (20:29 +0000)]
Bugfix: High resolution "exploded" when using uneven resolutions, sometimes with specific object scaling.

Part of Smoke Development Phase III.

Credit also goes to MiikaH: It was a teamwork effort and took days to track down. :)

8 years agoMerging r49463 through r49478 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 1 Aug 2012 19:23:50 +0000 (19:23 +0000)]
Merging r49463 through r49478 from trunk into soc-2011-tomato

8 years agoFix #31800: Blender crash by rendering in connection with linked groups
Sergey Sharybin [Wed, 1 Aug 2012 19:22:04 +0000 (19:22 +0000)]
Fix #31800: Blender crash by rendering in connection with linked groups

Seems the issue was caused by render layer node overwritng active scene
when render button is clicked. It lead t situations when job was adding
with owner of rendering scene, but modal callback was checking for render
jobs existing for current active scene. There was no such jobs so operator
used to finish at this point and free report list used by render pipeline.

Solved by storing operator owner in operator's custom data. Probably
there's nicer way to do fix this issue but currently can't think of it.

8 years agosplit node_edit.c into separate files (add, group, relationshops), was almost 5000...
Campbell Barton [Wed, 1 Aug 2012 19:11:17 +0000 (19:11 +0000)]
split node_edit.c into separate files (add, group, relationshops), was almost 5000 loc.

8 years agogame engine: Fix CcdPhysicsEnvironment functions that accessed m_solverInfo
Sergej Reich [Wed, 1 Aug 2012 17:59:32 +0000 (17:59 +0000)]
game engine: Fix CcdPhysicsEnvironment functions that accessed m_solverInfo

The functions had no effect because m_solverInfo wasn't used anywhere.
Now we get the solver info from the dynamics world directly instead of using our own copy.

8 years agofix: column flow layout wrongly calculated height of second and subsequent columns...
Andrea Weikert [Wed, 1 Aug 2012 17:52:14 +0000 (17:52 +0000)]
fix: column flow layout wrongly calculated height of second and subsequent columns when used with more than 2 columns.
* discovered while playing with the column flow layout in asset branch.

8 years agofix for assert when going from edit mode directly into sculpt mode.
Campbell Barton [Wed, 1 Aug 2012 17:25:10 +0000 (17:25 +0000)]
fix for assert when going from edit mode directly into sculpt mode.
the tessellation faces were not pre-calculated.

8 years agogame engine: Use flags instead of hardcoded numbers for rna properties
Sergej Reich [Wed, 1 Aug 2012 17:19:32 +0000 (17:19 +0000)]
game engine: Use flags instead of hardcoded numbers for rna properties

8 years agoFix own regression in cycles frame node caused by recent node rna changes
Sergey Sharybin [Wed, 1 Aug 2012 16:17:44 +0000 (16:17 +0000)]
Fix own regression in cycles frame node caused by recent node rna changes

svn merge -r49465:49466 ^/branches/soc-2011-tomato

8 years agoFix own regression in cycles material group cased by recent changes in nodes rna
Sergey Sharybin [Wed, 1 Aug 2012 16:16:10 +0000 (16:16 +0000)]
Fix own regression in cycles material group cased by recent changes in nodes rna

8 years agorename meaningless LIB flag name LIB_TEST --> LIB_NEED_EXPAND.
Campbell Barton [Wed, 1 Aug 2012 15:32:27 +0000 (15:32 +0000)]
rename meaningless LIB flag name LIB_TEST --> LIB_NEED_EXPAND.

8 years agoreplace 'GET_INT_FROM_POINTER( &((BHeadN*)0)->bhead) )' with 'offsetof(BHeadN, bhead))'
Campbell Barton [Wed, 1 Aug 2012 15:21:39 +0000 (15:21 +0000)]
replace 'GET_INT_FROM_POINTER( &((BHeadN*)0)->bhead) )' with 'offsetof(BHeadN, bhead))'

8 years agoMerging r49451 through r49462 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 1 Aug 2012 15:05:42 +0000 (15:05 +0000)]
Merging r49451 through r49462 from trunk into soc-2011-tomato

8 years agofix some more crashes when running skin operators on a mesh with no skin layer
Campbell Barton [Wed, 1 Aug 2012 15:04:10 +0000 (15:04 +0000)]
fix some more crashes when running skin operators on a mesh with no skin layer

8 years agoCode cleanup: silence some -Wnarrowing warnings from C++11
Sergey Sharybin [Wed, 1 Aug 2012 15:02:09 +0000 (15:02 +0000)]
Code cleanup: silence some -Wnarrowing warnings from C++11

8 years agoCycles:
Thomas Dinges [Wed, 1 Aug 2012 14:56:15 +0000 (14:56 +0000)]
* Removed outdated OpenCL comments, kernel features are defined in kernel_types.h now.

8 years agofix crash in sorting mesh elements when called without a viewport.
Campbell Barton [Wed, 1 Aug 2012 14:51:49 +0000 (14:51 +0000)]
fix crash in sorting mesh elements when called without a viewport.

8 years agoCode cleanup: remove some more unused includes of DNA_scene_types
Sergey Sharybin [Wed, 1 Aug 2012 14:51:12 +0000 (14:51 +0000)]
Code cleanup: remove some more unused includes of DNA_scene_types

8 years agoCode cleanup: Remove unused includes of DNA_scene_types.
Sergey Sharybin [Wed, 1 Aug 2012 14:48:51 +0000 (14:48 +0000)]
Code cleanup: Remove unused includes of DNA_scene_types.