8 years agosvn merge ^/trunk/blender -r43009:43033
Campbell Barton [Sat, 31 Dec 2011 12:03:36 +0000 (12:03 +0000)]
svn merge ^/trunk/blender -r43009:43033

8 years agoFix for compilation error when compiling dualcon with mingw
Sergey Sharybin [Sat, 31 Dec 2011 11:08:04 +0000 (11:08 +0000)]
Fix for compilation error when compiling dualcon with mingw

8 years agoCode cleanup: do not use check for nan when doing check for finite due to
Sergey Sharybin [Sat, 31 Dec 2011 11:03:32 +0000 (11:03 +0000)]
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.

8 years agoFix: Material "Vertex Color Light" option didn't apply vertex alpha.
Miika Hamalainen [Sat, 31 Dec 2011 10:46:21 +0000 (10:46 +0000)]
Fix: Material "Vertex Color Light" option didn't apply vertex alpha.

8 years agoDynamic Paint:
Miika Hamalainen [Sat, 31 Dec 2011 10:28:36 +0000 (10:28 +0000)]
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.

8 years agoChanging KX_FontObject to look for a "Text" game property instead of a "text" propert...
Daniel Stokes [Sat, 31 Dec 2011 09:37:19 +0000 (09:37 +0000)]
Changing KX_FontObject to look for a "Text" game property instead of a "text" property to match with bitmap font usage.

8 years agoMinor code cleanup after resolving conflicts
Sergey Sharybin [Sat, 31 Dec 2011 09:30:39 +0000 (09:30 +0000)]
Minor code cleanup after resolving conflicts

8 years agoTag object with object solver constraint to recalc when changing value of
Sergey Sharybin [Sat, 31 Dec 2011 08:26:59 +0000 (08:26 +0000)]
Tag object with object solver constraint to recalc when changing value of
tracking object scale.

8 years agoDo not set scene's camera on camera solving and cursor snapping
Sergey Sharybin [Sat, 31 Dec 2011 08:26:32 +0000 (08:26 +0000)]
Do not set scene's camera on camera solving and cursor snapping

8 years agofix [#29734] Crash after bpy.ops.file.direrectory_new()
Campbell Barton [Sat, 31 Dec 2011 03:52:07 +0000 (03:52 +0000)]
fix [#29734] Crash after bpy.ops.file.direrectory_new()

8 years agofix [#29735] Blender crashes with ACCESS_VIOLATION when snapping cursor to camera
Campbell Barton [Sat, 31 Dec 2011 03:45:31 +0000 (03:45 +0000)]
fix [#29735] Blender crashes with ACCESS_VIOLATION when snapping cursor to camera

8 years agooption to build without remesh modifier for cmake and scons
Campbell Barton [Sat, 31 Dec 2011 03:34:44 +0000 (03:34 +0000)]
option to build without remesh modifier for cmake and scons

8 years agosvn merge ^/trunk/blender -r42991:43009
Campbell Barton [Sat, 31 Dec 2011 03:07:14 +0000 (03:07 +0000)]
svn merge ^/trunk/blender -r42991:43009

8 years agoworkaround for error building with clang and quiet some warnings building without...
Campbell Barton [Sat, 31 Dec 2011 03:01:18 +0000 (03:01 +0000)]
workaround for error building with clang and quiet some warnings building without libmv.

8 years agominor style edits to space_clip & unused var
Campbell Barton [Sat, 31 Dec 2011 02:40:33 +0000 (02:40 +0000)]
minor style edits to space_clip & unused var

8 years agoSmall tweaks from Zafio for the remesh modifier icon
Nicholas Bishop [Fri, 30 Dec 2011 23:10:23 +0000 (23:10 +0000)]
Small tweaks from Zafio for the remesh modifier icon

8 years agoPatch is partially made by Pelle Johnsen. Thanks!
Alexander Kuznetsov [Fri, 30 Dec 2011 22:10:48 +0000 (22:10 +0000)]
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:

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

8 years agoFix for Remesh Modifier:
Thomas Dinges [Fri, 30 Dec 2011 21:29:02 +0000 (21:29 +0000)]
Fix for Remesh Modifier:
* Remesh Icon was missing in the outliner.

8 years agoAdd remesh modifier (dual contouring).
Nicholas Bishop [Fri, 30 Dec 2011 21:11:40 +0000 (21:11 +0000)]
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:

The remesh icon was contributed by Zafio:
Thanks to everyone in that thread for the icon proposals and

Documentation and examples on the Blender wiki:

In case the history is needed for anything, check the remesh-modifier
branch of this git repository:

8 years agoDisable markers when doing frame-by-frame tracking and tracker library returns failure
Sergey Sharybin [Fri, 30 Dec 2011 18:15:44 +0000 (18:15 +0000)]
Disable markers when doing frame-by-frame tracking and tracker library returns failure

8 years agoObject tracking integration
Sergey Sharybin [Fri, 30 Dec 2011 18:06:02 +0000 (18:06 +0000)]
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,

8 years agopatch [#29726] Enable looping with Follow Path constraint and cyclic curves. by...
Campbell Barton [Fri, 30 Dec 2011 14:52:03 +0000 (14:52 +0000)]
patch [#29726] Enable looping with Follow Path constraint and cyclic curves.   by Peter Amstutz (tetron)

8 years agoColor management: add "Color Unpremultiply" option for images and render settings.
Brecht Van Lommel [Fri, 30 Dec 2011 14:17:11 +0000 (14:17 +0000)]
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.

8 years agouse PyUnicode_From_STR_String in the game engine in more places.
Campbell Barton [Fri, 30 Dec 2011 12:44:16 +0000 (12:44 +0000)]
use PyUnicode_From_STR_String in the game engine in more places.

8 years agocucumber merge, multiline font object:
Dalai Felinto [Fri, 30 Dec 2011 12:28:51 +0000 (12:28 +0000)]
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.

8 years agoformatting edits, missed these last commit.
Campbell Barton [Fri, 30 Dec 2011 11:49:58 +0000 (11:49 +0000)]
formatting edits, missed these last commit.

8 years agofix [#29686] Weight paint paints when it shouldn't
Campbell Barton [Fri, 30 Dec 2011 11:37:54 +0000 (11:37 +0000)]
fix [#29686] Weight paint paints when it shouldn't

disallow painting when active group is locked

8 years agopatch from Jason Hays
Campbell Barton [Fri, 30 Dec 2011 11:31:48 +0000 (11:31 +0000)]
patch from Jason Hays
Locking only redistributes or restricts weights when using bone groups.
So, in addition to adding a NULL check to my last bit of code, I made
has_locked_group() check for bone groups.

8 years agoCamera tracking: improvements of track preview widget
Sergey Sharybin [Fri, 30 Dec 2011 10:20:29 +0000 (10:20 +0000)]
Camera tracking: improvements of track preview widget

- Enable bicybic filtering fir image displayed in track preview
- Option to show grayscale content of track preview
- When some channels are disabled, display exactly the same
  content of preview image which is sending to tracker library.

Merged from tomato branch using command:
    svn merge -r42382:42383 -r42384:42385 -r42394:42395 \
    -r42397:42398 -r42398:42399 -r42406:42407 \
-r42410:42411 -r42417:42418 -r42471:42472 \

8 years agosvn merge ^/trunk/blender -r42973:42991
Campbell Barton [Fri, 30 Dec 2011 09:23:06 +0000 (09:23 +0000)]
svn merge ^/trunk/blender -r42973:42991

8 years agoFixed low boundary when detecting frames range for camera solver
Sergey Sharybin [Fri, 30 Dec 2011 08:40:36 +0000 (08:40 +0000)]
Fixed low boundary when detecting frames range for camera solver

8 years agocheck for presets in addons dirs. this way addons can install their own presets too.
Campbell Barton [Fri, 30 Dec 2011 08:39:40 +0000 (08:39 +0000)]
check for presets in addons dirs. this way addons can install their own presets too.

8 years agoFix #29729: Blender crashes when camera solving with a disabled marker
Sergey Sharybin [Fri, 30 Dec 2011 08:34:00 +0000 (08:34 +0000)]
Fix #29729: Blender crashes when camera solving with a disabled marker

Stupid mistake in index of last marker when detecting frames bounds

8 years agostyle edits for function declarations
Campbell Barton [Fri, 30 Dec 2011 07:55:15 +0000 (07:55 +0000)]
style edits for function declarations

8 years agominor dna header cleanup
Campbell Barton [Fri, 30 Dec 2011 07:25:49 +0000 (07:25 +0000)]
minor dna header cleanup

8 years agoPyAPI - remove Matrix.row_size / col_size. these were rather awkwardly named, but...
Campbell Barton [Fri, 30 Dec 2011 06:43:17 +0000 (06:43 +0000)]
PyAPI - remove Matrix.row_size / col_size. these were rather awkwardly named, but its more clear to use len().

mat.col_size --> len(mat.row)
mat.row_size --> len(mat.col)

8 years agoweight paint - fix for own error in r42986, also avoid getting unified settings for...
Campbell Barton [Fri, 30 Dec 2011 05:16:28 +0000 (05:16 +0000)]
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.

8 years agoimprovement to how weight paint blur works
Campbell Barton [Fri, 30 Dec 2011 04:38:45 +0000 (04:38 +0000)]
improvement to how weight paint blur works
* the accumulated blur weight now takes into account how far verts are from the brush, giving more even results
* verts where the weight wasnt found were being ignored, now treat them as zero weight verts.

8 years agoget the brush size at before applying each brush step, saves unified brush settings...
Campbell Barton [Fri, 30 Dec 2011 03:50:04 +0000 (03:50 +0000)]
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner.

also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.

8 years agowhile checking weight paint code noticed that unified brush functions loop over the...
Campbell Barton [Fri, 30 Dec 2011 03:43:39 +0000 (03:43 +0000)]
while checking weight paint code noticed that unified brush functions loop over the scenes to get the flag.
* this loop is called multiple times per vertex (not addressed in this commit)
* functions like brush_use_size_pressure(), brush_use_size_pressure() called unified_settings() twice when they didnt need to.

looks like this code cant work right with multiple scenes, added a comment on this - but at least avoid calling unified_settings() multiple times in single functions.

8 years agominor edits to weight paint
Campbell Barton [Fri, 30 Dec 2011 02:16:07 +0000 (02:16 +0000)]
minor edits to weight paint
* store the active vertex group (avoid doing ob->actdef-1 for every vertex)
* ensure the active vertex group isn't less then 0.

8 years agoFix: cycles camera dof object with non-uniform scale gave incorrect distance.
Brecht Van Lommel [Thu, 29 Dec 2011 23:34:25 +0000 (23:34 +0000)]
Fix: cycles camera dof object with non-uniform scale gave incorrect distance.

8 years agoFix #29687: Normal bake from multires gives distorted results.
Sergey Sharybin [Thu, 29 Dec 2011 16:05:09 +0000 (16:05 +0000)]
Fix #29687: Normal bake from multires gives distorted results.

It is just a limitation of multires baker which doesn't deal correct with
baking to subdivision level 0. It was supposed to work with levels on which
sculpt data is affecting on mesh, so interpolation between grids works correct.

Fully accurate baking in this case will need raycasting stuff which will make
it much slower and will remove main benefit of regular baker -- speed and
low memory usage.
Another option would be to make multires apply sculpting data on level 0,
but it's not related at baking at all and has got it's own difficulties.

8 years agoFix #29718: anchored stroke with image-texture --- strange behaviour
Sergey Sharybin [Thu, 29 Dec 2011 14:57:15 +0000 (14:57 +0000)]
Fix #29718: anchored stroke with image-texture --- strange behaviour

Bug was caused by refactoring in rev41470

8 years agopy - fix for error which made enums not through errors when assigned non string types
Campbell Barton [Thu, 29 Dec 2011 14:46:26 +0000 (14:46 +0000)]
py - fix for error which made enums not through errors when assigned non string types

8 years agoAdd code to make knife cut through whole mesh optionally.
Howard Trickey [Thu, 29 Dec 2011 13:43:59 +0000 (13:43 +0000)]
Add code to make knife cut through whole mesh optionally.
- only cuts through when the occlude geometry button is unpushed,
  else the old behavior
- doesn't add points in middle of occluded faces yet, so will not
  make partial cuts or hole cuts in occluded faces; for best
  results, start and finish cuts completely outside the mesh
- also made slight improvement to behavior when starting cut
  off the model
- a small refactor: added knife_add_to_vert_edges for code
  used a number of times

8 years agopossible fix for [#29708] Crashes when Rendering Cross Dissolve + XVID Codec
Campbell Barton [Thu, 29 Dec 2011 13:12:40 +0000 (13:12 +0000)]
possible fix for [#29708] Crashes when Rendering Cross Dissolve + XVID Codec

was calling memcpy with both src and dst args were the same pointer.

8 years agosvn merge ^/trunk/blender -r42967:42973
Campbell Barton [Thu, 29 Dec 2011 12:17:45 +0000 (12:17 +0000)]
svn merge ^/trunk/blender -r42967:42973

8 years agouse math functions for customdata interpolation funcs
Campbell Barton [Thu, 29 Dec 2011 11:18:12 +0000 (11:18 +0000)]
use math functions for customdata interpolation funcs

8 years agoRemove totally crappy and not used operator FONT_OT_buffer_paste
Sergey Sharybin [Thu, 29 Dec 2011 10:02:42 +0000 (10:02 +0000)]
Remove totally crappy and not used operator FONT_OT_buffer_paste

8 years agominor speedup to CDDM_merge_verts (called by mirror)
Campbell Barton [Thu, 29 Dec 2011 09:41:31 +0000 (09:41 +0000)]
minor speedup to CDDM_merge_verts (called by mirror)
* was doing 2 edge hash lookups, where only 1 was needed.
* was checking MLoop verts and edges if they were -1, when they are never set to -1

8 years agobmesh mirror modifier cleanup
Campbell Barton [Thu, 29 Dec 2011 09:15:06 +0000 (09:15 +0000)]
bmesh mirror modifier cleanup
* vertex map was a dynamicly realloc'd array when the final size was known, use a fixed array instead.
* vertex map was being calculated even when not used.
* face tesselation was being called twice.
* an unused deform group array was being created.

8 years agobmesh mirror modifier wasn't doing UV mirror at all.
Campbell Barton [Thu, 29 Dec 2011 07:29:44 +0000 (07:29 +0000)]
bmesh mirror modifier wasn't doing UV mirror at all.

8 years agosvn merge ^/trunk/blender -r42957:42967
Campbell Barton [Thu, 29 Dec 2011 06:44:51 +0000 (06:44 +0000)]
svn merge ^/trunk/blender -r42957:42967

8 years agoremove unused initFlags option in mirror modifier
Campbell Barton [Thu, 29 Dec 2011 06:32:50 +0000 (06:32 +0000)]
remove unused initFlags option in mirror modifier

8 years agominor edits to trunk mirror modifier, use unsigned ints since the vertex values are...
Campbell Barton [Thu, 29 Dec 2011 06:07:34 +0000 (06:07 +0000)]
minor edits to trunk mirror modifier, use unsigned ints since the vertex values are unsigned + minor formatting edits

8 years agobugfix: [#29711] Cycles - HSV Node - Hue Change Bug
Dalai Felinto [Thu, 29 Dec 2011 05:40:48 +0000 (05:40 +0000)]
bugfix: [#29711] Cycles - HSV Node - Hue Change Bug
* Adding hue instead of removing it.

fmod doesn't work as % when it comes to negative numbers:
fmod( 1.3, 1) ==  1.3 % 1 == 0.3
fmod(-0.3, 1) != -0.3 % 1

8 years agoarray had its own unused vertgroup_flip_name function. removed.
Campbell Barton [Thu, 29 Dec 2011 04:07:57 +0000 (04:07 +0000)]
array had its own unused vertgroup_flip_name function. removed.

8 years agosyncing modifiers with trunk - only small changes
Campbell Barton [Thu, 29 Dec 2011 04:04:27 +0000 (04:04 +0000)]
syncing modifiers with trunk - only small changes

8 years agooptimized mempool iterator from bmesh
Campbell Barton [Thu, 29 Dec 2011 03:39:59 +0000 (03:39 +0000)]
optimized mempool iterator from bmesh

8 years agoskip sorting loop indices when tesselating if the original poly is a quad or a tri.
Campbell Barton [Thu, 29 Dec 2011 03:24:28 +0000 (03:24 +0000)]
skip sorting loop indices when tesselating if the original poly is a quad or a tri.

8 years agoMingw - use truly relative instead of absolute-relative paths for Boost and OIIO
Joshua Leung [Thu, 29 Dec 2011 02:57:41 +0000 (02:57 +0000)]
Mingw - use truly relative instead of absolute-relative paths for Boost and OIIO

That is, instead of '#../lib/windows/lib_name/include', we're now using BF_LIBNAME + '/include'. This makes it possible to have a single lib folder shared between several local working trees again.

8 years agooptimized version of BLI_mempool_iterstep() which uses branch pradiction to get a...
Campbell Barton [Thu, 29 Dec 2011 02:55:20 +0000 (02:55 +0000)]
optimized version of BLI_mempool_iterstep() which uses branch pradiction to get a little bit more performance, since this is used for looping on all mesh data elements

8 years agosvn merge ^/trunk/blender -r42953:42957
Campbell Barton [Thu, 29 Dec 2011 01:58:47 +0000 (01:58 +0000)]
svn merge ^/trunk/blender -r42953:42957

8 years agoadd UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot...
Campbell Barton [Thu, 29 Dec 2011 01:46:58 +0000 (01:46 +0000)]
add UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot, only defined for gcc at the moment.

also some cmake formatting edits.

8 years agomore mist settings should be accesible to BGE
Dalai Felinto [Thu, 29 Dec 2011 01:38:11 +0000 (01:38 +0000)]
more mist settings should be accesible to BGE

8 years agofile missing from cmake listing
Campbell Barton [Wed, 28 Dec 2011 22:57:25 +0000 (22:57 +0000)]
file missing from cmake listing

8 years agosvn merge ^/trunk/blender -r42940:42953
Campbell Barton [Wed, 28 Dec 2011 22:55:45 +0000 (22:55 +0000)]
svn merge ^/trunk/blender -r42940:42953

8 years agothis missed merging from trunk somehow (mesh make local edits)
Campbell Barton [Wed, 28 Dec 2011 22:47:55 +0000 (22:47 +0000)]
this missed merging from trunk somehow (mesh make local edits)

8 years agosync changes from bmesh r42951 + some other minor edits.
Campbell Barton [Wed, 28 Dec 2011 22:46:10 +0000 (22:46 +0000)]
sync changes from bmesh r42951 + some other minor edits.

8 years agocache customdata checks to avoid looking up on each call to mesh_loops_to_mface_corners()
Campbell Barton [Wed, 28 Dec 2011 22:37:09 +0000 (22:37 +0000)]
cache customdata checks to avoid looking up on each call to mesh_loops_to_mface_corners()

8 years agoFix loading .blend files (disable pre-bmesh forward-compat code for loading MPolys...
Andrew Wiggin [Wed, 28 Dec 2011 21:38:21 +0000 (21:38 +0000)]
Fix loading .blend files (disable pre-bmesh forward-compat code for loading MPolys and converting to MFaces)

8 years agoFix compile error from commit 42941
Howard Trickey [Wed, 28 Dec 2011 21:09:29 +0000 (21:09 +0000)]
Fix compile error from commit 42941

8 years agoFix #29692: 3D Scene is Rendering Bright in the VSE
Sergey Sharybin [Wed, 28 Dec 2011 20:11:36 +0000 (20:11 +0000)]
Fix #29692: 3D Scene is Rendering Bright in the VSE

profile conversion for sequencer result sued to happen even if
color management is disabled for scene which made frames brighter.

8 years agoFix #29715: cycles and glsl normal node not working correct.
Brecht Van Lommel [Wed, 28 Dec 2011 19:42:22 +0000 (19:42 +0000)]
Fix #29715: cycles and glsl normal node not working correct.

8 years agoFix #29689, #29702: cycles render crash with node setups with non-cycles nodes,
Brecht Van Lommel [Wed, 28 Dec 2011 19:42:08 +0000 (19:42 +0000)]
Fix #29689, #29702: cycles render crash with node setups with non-cycles nodes,
after group socket refactoring.

8 years agoMerging r42896 through r42944 from trunk into soc-2911-tomato
Sergey Sharybin [Wed, 28 Dec 2011 18:31:32 +0000 (18:31 +0000)]
Merging r42896 through r42944 from trunk into soc-2911-tomato

8 years agoFix #29696: Crash on exit of edit mode after deleting contents of fluid domain
Sergey Sharybin [Wed, 28 Dec 2011 17:59:56 +0000 (17:59 +0000)]
Fix #29696: Crash on exit of edit mode after deleting contents of fluid domain

Added NULL-check to copying material number and flags when loading cache

8 years agosvn merge ^/trunk/blender -r42935:42940
Campbell Barton [Wed, 28 Dec 2011 15:14:52 +0000 (15:14 +0000)]
svn merge ^/trunk/blender -r42935:42940

8 years agoScons/FFMPEG:
Thomas Dinges [Wed, 28 Dec 2011 15:08:58 +0000 (15:08 +0000)]
* Fixing compile error, ffmpeg include was missing.

8 years agocorrect define
Campbell Barton [Wed, 28 Dec 2011 15:07:00 +0000 (15:07 +0000)]
correct define

8 years agofiles from bmesh now load in trunk, this way loading (2.64 (or whenever bmesh is...
Campbell Barton [Wed, 28 Dec 2011 14:58:45 +0000 (14:58 +0000)]
files from bmesh now load in trunk, this way loading (2.64 (or whenever bmesh is merged)), wont crash 2.62.

8 years agofix for recent compile error
Campbell Barton [Wed, 28 Dec 2011 14:55:45 +0000 (14:55 +0000)]
fix for recent compile error

8 years agosvn merge ^/trunk/blender -r42931:42935
Campbell Barton [Wed, 28 Dec 2011 14:28:56 +0000 (14:28 +0000)]
svn merge ^/trunk/blender -r42931:42935

8 years agoWIP bmesh trunk sync, excuse the noise
Campbell Barton [Wed, 28 Dec 2011 14:26:59 +0000 (14:26 +0000)]
WIP bmesh trunk sync, excuse the noise

8 years agosyncing with trunk, remove unused function
Campbell Barton [Wed, 28 Dec 2011 14:22:46 +0000 (14:22 +0000)]
syncing with trunk, remove unused function

8 years agomore changes from bmesh into trunk (mesh mpoly strict member)
Campbell Barton [Wed, 28 Dec 2011 14:21:51 +0000 (14:21 +0000)]
more changes from bmesh into trunk (mesh mpoly strict member)

8 years agosvn merge ^/trunk/blender -r42927:42931
Campbell Barton [Wed, 28 Dec 2011 14:05:02 +0000 (14:05 +0000)]
svn merge ^/trunk/blender -r42927:42931

8 years agoWIP loading bmesh in trunk, some conversion functions for this purpose.
Campbell Barton [Wed, 28 Dec 2011 13:50:33 +0000 (13:50 +0000)]
WIP loading bmesh in trunk, some conversion functions for this purpose.

8 years agomerge bleshes BLI_array header lib into trunk.
Campbell Barton [Wed, 28 Dec 2011 13:40:14 +0000 (13:40 +0000)]
merge bleshes BLI_array header lib into trunk.

8 years agosvn merge ^/trunk/blender -r42920:42927
Campbell Barton [Wed, 28 Dec 2011 13:33:35 +0000 (13:33 +0000)]
svn merge ^/trunk/blender -r42920:42927

8 years agoCode refactoring: add unified image buffer functions for doing float => byte,
Brecht Van Lommel [Wed, 28 Dec 2011 13:29:33 +0000 (13:29 +0000)]
Code refactoring: add unified image buffer functions for doing float => byte,
byte => float, float => float, byte => byte conversions with profile, dither
and predivide. Previously code for this was spread out too much.

There should be no functional changes, this is so the predivide/table/dither
patches can work correctly.

8 years agominor edits
Campbell Barton [Wed, 28 Dec 2011 13:24:49 +0000 (13:24 +0000)]
minor edits

8 years agoenable USE_BMESH_FORWARD_COMPAT and merge in some customdata functions
Campbell Barton [Wed, 28 Dec 2011 13:23:59 +0000 (13:23 +0000)]
enable USE_BMESH_FORWARD_COMPAT and merge in some customdata functions

8 years agoinitial merge of bmesh customdata layer code into trunk, ifdef'd out for now with...
Campbell Barton [Wed, 28 Dec 2011 13:15:17 +0000 (13:15 +0000)]
initial merge of bmesh customdata layer code into trunk, ifdef'd out for now with USE_BMESH_FORWARD_COMPAT.

8 years agosync customdata layers up with trunk. existing bmesh files will crash on load but...
Campbell Barton [Wed, 28 Dec 2011 13:11:46 +0000 (13:11 +0000)]
sync customdata layers up with trunk. existing bmesh files will crash on load but this is unavoidable.

8 years agoFix #29707: Sequencer presets corrupt audio scene settings
Sergey Sharybin [Wed, 28 Dec 2011 12:39:35 +0000 (12:39 +0000)]
Fix #29707: Sequencer presets corrupt audio scene settings

Problem was caused by using amount of channels as integer instead of enum
identifiers in preset files.

8 years agoAdd FFmpeg libraries versions to system-info.txt
Sergey Sharybin [Wed, 28 Dec 2011 12:35:58 +0000 (12:35 +0000)]
Add FFmpeg libraries versions to system-info.txt

8 years agosvn merge ^/trunk/blender -r42918:42920
Campbell Barton [Wed, 28 Dec 2011 11:20:45 +0000 (11:20 +0000)]
svn merge ^/trunk/blender -r42918:42920

8 years agomake MOD_dynamicpaint.c use more typical gpl2+ text and some formatting edits in DNA
Campbell Barton [Wed, 28 Dec 2011 11:08:38 +0000 (11:08 +0000)]
make MOD_dynamicpaint.c use more typical gpl2+ text and some formatting edits in DNA