http://www.miikahweb.com/feed.php MiikaHweb - Blender Soc-2013-depsgraph_mt Branch http://www.miikahweb.com/ MiikaHweb - Blender Soc-2013-depsgraph_mt Branch fi Mon, 09 Dec 19 09:44:13 +0000 MiikaHweb RSS contact at miikahweb.com <![CDATA[[03e3881]: Merge branch 'master' into soc-2013-depsgraph_mt]]> http://www.miikahweb.com/en/blender/git-logs/commit/03e388127034c35c82ed0f84b2239125111db5a4 03e3881
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merge branch 'master' into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Mon, 23 Dec 2013 17:14:46 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/03e388127034c35c82ed0f84b2239125111db5a4Sergey Sharybin
<![CDATA[[0712d43]: Merging r60854 through r60868 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/0712d43310c55b6b9af67a05515173c3d8bd25ef 0712d43
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r60854 through r60868 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Sun, 20 Oct 2013 12:10:37 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0712d43310c55b6b9af67a05515173c3d8bd25efSergey Sharybin
<![CDATA[[07adc11]: Code cleanup to address Lukas codereview comments]]> http://www.miikahweb.com/en/blender/git-logs/commit/07adc115888affb0030e12593dd4909c2182b9b4 07adc11
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Code cleanup to address Lukas codereview comments

----------------------------------------
2 Paths Changed]]>
Wed, 11 Dec 2013 16:47:17 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/07adc115888affb0030e12593dd4909c2182b9b4Sergey Sharybin
<![CDATA[[0850ef8]: Merging r60012 through r60068 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/0850ef8f59808e62a97e6f14b8404601f2bcdd3b 0850ef8
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r60012 through r60068 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Thu, 12 Sep 2013 12:07:39 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0850ef8f59808e62a97e6f14b8404601f2bcdd3bSergey Sharybin
<![CDATA[[0960d21]: Address review from Brecht]]> http://www.miikahweb.com/en/blender/git-logs/commit/0960d2114af40663869e030e69faa4bba04c0f3a 0960d21
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Address review from Brecht

* Removed residual of derivedRender code from convertblender.c
* Added check for oldcreen->scene != screen->scene before rebuilding
the DAG when changing the scene.
* Made blender compilable with smoke disabled.
* Typo fixes.

----------------------------------------
4 Paths Changed]]>
Fri, 13 Dec 2013 10:17:11 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0960d2114af40663869e030e69faa4bba04c0f3aSergey Sharybin
<![CDATA[[0b00e7c]: Merging r59529 through r59550 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/0b00e7c7532b407e327a380de2a07895d28e1a6a 0b00e7c
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59529 through r59550 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Tue, 27 Aug 2013 11:05:56 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0b00e7c7532b407e327a380de2a07895d28e1a6aSergey Sharybin
<![CDATA[[0e07573]: Code cleanup]]> http://www.miikahweb.com/en/blender/git-logs/commit/0e07573f15f2d7a93d78f19105008137501083bf 0e07573
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Code cleanup

----------------------------------------
2 Paths Changed]]>
Fri, 23 Aug 2013 08:39:25 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0e07573f15f2d7a93d78f19105008137501083bfSergey Sharybin
<![CDATA[[10961fa]: Temporary remove derivedRender]]> http://www.miikahweb.com/en/blender/git-logs/commit/10961faa924a281c8c50deae3cf074a9d89b557d 10961fa
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Temporary remove derivedRender

Couldn't say the idea was wrong, but some nasty bugs were
discovered with the approach and to make life simpler for
now it's easier to do hacks needed for boolean modifier
from the render pipeline by tagging needed operands for
the update.

----------------------------------------
11 Paths Changed]]>
Tue, 10 Dec 2013 11:23:35 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/10961faa924a281c8c50deae3cf074a9d89b557dSergey Sharybin
<![CDATA[[1314a68]: Mark some CCG funcrions as inlined]]> http://www.miikahweb.com/en/blender/git-logs/commit/1314a68bb8926a10f20bb6e632289323e40a4c66 1314a68
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Mark some CCG funcrions as inlined

This seems to be giving speedup up to 10%
and in fact perhaps the change need to go
to the trunk.

----------------------------------------
7 Paths Changed]]>
Fri, 13 Sep 2013 13:22:18 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/1314a68bb8926a10f20bb6e632289323e40a4c66Sergey Sharybin
<![CDATA[[13dc30c]: Make evaluatio ncontext a part of render strcture]]> http://www.miikahweb.com/en/blender/git-logs/commit/13dc30cd5ca806d93a782bf243d95de92f4fed1b 13dc30c
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Make evaluatio ncontext a part of render strcture

That's how it's supposed to be actually.

----------------------------------------
3 Paths Changed]]>
Fri, 18 Oct 2013 22:15:09 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/13dc30cd5ca806d93a782bf243d95de92f4fed1bSergey Sharybin
<![CDATA[[15e813f]: Merging r59745 through r59765 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/15e813f5d4f5165496fa3cbe313305fbc098f03e 15e813f
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59745 through r59765 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Tue, 03 Sep 2013 10:43:27 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/15e813f5d4f5165496fa3cbe313305fbc098f03eSergey Sharybin
<![CDATA[[1882daa]: Shrintwrap modifier will use proper derived mesh in render...]]> http://www.miikahweb.com/en/blender/git-logs/commit/1882daa9bef2da1e765a38d0201465c6a85a783c 1882daa
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Shrintwrap modifier will use proper derived mesh in render mode

Still to come: constraints are still using viewport derived mesh,
need to pass EvaluationContext there.

----------------------------------------
4 Paths Changed]]>
Thu, 05 Sep 2013 12:23:23 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/1882daa9bef2da1e765a38d0201465c6a85a783cSergey Sharybin
<![CDATA[[1cd8f4c]: Merging r59941 through r60011 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/1cd8f4c36fb582c9420172768ef709469528e3dd 1cd8f4c
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59941 through r60011 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Tue, 10 Sep 2013 14:59:29 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/1cd8f4c36fb582c9420172768ef709469528e3ddSergey Sharybin
<![CDATA[[267cc78]: Mask curve BB code as TODO resolved]]> http://www.miikahweb.com/en/blender/git-logs/commit/267cc78b94dba769f620788b639697c21352ce03 267cc78
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Mask curve BB code as TODO resolved

Nothing really could be done here to improve anything,
we'll just live with CV min/max + radius.

----------------------------------------
1 Path Changed]]>
Mon, 26 Aug 2013 12:09:13 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/267cc78b94dba769f620788b639697c21352ce03Sergey Sharybin
<![CDATA[[2820b7a]: Remove workaround for dupligroups update]]> http://www.miikahweb.com/en/blender/git-logs/commit/2820b7a1d8e83460e56204a4d8ba006f106457a2 2820b7a
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Remove workaround for dupligroups update

After checking bunch of tube and mango files, it ends up
that using DAG nodes instead of base objects will handle
all needed objects from dupligroups.

----------------------------------------
1 Path Changed]]>
Mon, 26 Aug 2013 12:07:00 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/2820b7a1d8e83460e56204a4d8ba006f106457a2Sergey Sharybin
<![CDATA[[2a094a2]: Experiment: get rid of static in_next_object in mballs traversal...]]> http://www.miikahweb.com/en/blender/git-logs/commit/2a094a25afae6ee651b3b89ffaba1dfc61c02c58 2a094a2
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Experiment: get rid of static in_next_object in mballs traversal

This check was used to prevent recursion caused by object_dupilist
calling MBall display list creation.

Solved by using object_duplilist_ex with update flag set to false.

From quick own tests and .blend file form original report seems
everything is fine. But maybe some unforeseen case will break
blender again.

----------------------------------------
1 Path Changed]]>
Wed, 21 Aug 2013 09:08:25 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/2a094a25afae6ee651b3b89ffaba1dfc61c02c58Sergey Sharybin
<![CDATA[[2c206fe]: Fixes for stupid mistakes from a while ago]]> http://www.miikahweb.com/en/blender/git-logs/commit/2c206febd567775ba9ea21491b526e3b7f641d80 2c206fe
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Fixes for stupid mistakes from a while ago

- Render engine's evaluation context didn't set for_render to truth.
- Use G.evaluation_context for motion path instead of local one.

----------------------------------------
2 Paths Changed]]>
Wed, 20 Nov 2013 19:50:57 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/2c206febd567775ba9ea21491b526e3b7f641d80Sergey Sharybin
<![CDATA[[2f0f43c]: Disable render constraints evaluation for now]]> http://www.miikahweb.com/en/blender/git-logs/commit/2f0f43cc36085f70b14fda1ead81a5a013bb5feb 2f0f43c
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Disable render constraints evaluation for now

This is needed to prevent possible regressions caused
by viewport/render conflict which are using the same
ob->obmat and be able to commit current work to SVN.

----------------------------------------
1 Path Changed]]>
Thu, 05 Sep 2013 12:23:33 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/2f0f43cc36085f70b14fda1ead81a5a013bb5febSergey Sharybin
<![CDATA[[37d268d]: Merging r59402 through r59406 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/37d268d73e9b76e00b058d5192775e8c189cc26c 37d268d
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59402 through r59406 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Fri, 23 Aug 2013 09:44:24 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/37d268d73e9b76e00b058d5192775e8c189cc26cSergey Sharybin
<![CDATA[[3822a6f]: Merging r60069 through r60105 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/3822a6f008b926e7f2b8af797a0586713224b93e 3822a6f
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r60069 through r60105 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Fri, 13 Sep 2013 13:25:55 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/3822a6f008b926e7f2b8af797a0586713224b93eSergey Sharybin
<![CDATA[[3da0eae]: scons + mingw Compile Fixes for r.59942]]> http://www.miikahweb.com/en/blender/git-logs/commit/3da0eae73d2b2740e990685af2ce1fef364a05fd 3da0eae
Branches : soc-2013-depsgraph_mt
Author : Joshua Leung (aligorith)
----------------------------------------
scons + mingw Compile Fixes for r.59942

* SCons files for guardedalloc module requires all the source files to be listed out, like in CMake.

* mingw32 (or at least gcc 4.6.2) seems to follow the Windows convention of using _msize() instead of having a "malloc_usable_size()"

----------------------------------------
2 Paths Changed]]>
Thu, 12 Sep 2013 13:29:07 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/3da0eae73d2b2740e990685af2ce1fef364a05fdJoshua Leung
<![CDATA[[40223ff]: Rename evaluation_context to eval_ctx]]> http://www.miikahweb.com/en/blender/git-logs/commit/40223ffe699e3b9c112441c8c313960b4692db9d 40223ff
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Rename evaluation_context to eval_ctx

Only affects on variable name, structure name stays the same.
Addresses code review from Campbell to make variable names
which are being passed all over be short.

Not entirely happy with this, but well ok. It's still verbose
enough and naming kind of consistent to what Python uses.

Discussed with Brecht and he's also fine with such a change.

Hopefully this is last change to be done before merge :)

----------------------------------------
43 Paths Changed]]>
Mon, 23 Dec 2013 07:50:53 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/40223ffe699e3b9c112441c8c313960b4692db9dSergey Sharybin
<![CDATA[[41651bc]: Merging r59379 through r59399 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/41651bc73441bcdd276d0a5b5cf55dd80e92ed1d 41651bc
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59379 through r59399 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Fri, 23 Aug 2013 07:14:22 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/41651bc73441bcdd276d0a5b5cf55dd80e92ed1dSergey Sharybin
<![CDATA[[43e2b34]: Address notes from Campbell's review]]> http://www.miikahweb.com/en/blender/git-logs/commit/43e2b343e4e151ecec528acf747320633909e14f 43e2b34
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Address notes from Campbell's review

- Cleanup naming in some places.
- Get rid of _ex functions with use_threads argument
in scene update routines.

Using Py_BEGIN_ALLOW_THREADS from frame_set and
update_tagged functions seems made the trick.

- Fix for possible uninitialized members of
evaluation context when it's allocated in stack.

----------------------------------------
19 Paths Changed]]>
Tue, 17 Dec 2013 17:10:07 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/43e2b343e4e151ecec528acf747320633909e14fSergey Sharybin
<![CDATA[[46617ef]: Merging r59407 through r59512 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/46617efe3ed82697bab6cbc0dfa7ef19748505fb 46617ef
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59407 through r59512 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Mon, 26 Aug 2013 12:02:50 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/46617efe3ed82697bab6cbc0dfa7ef19748505fbSergey Sharybin
<![CDATA[[5067501]: Simplify code around detailed analysis in scene.c]]> http://www.miikahweb.com/en/blender/git-logs/commit/5067501b4056568fba574a0bbe0eee965e8a1b87 5067501
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Simplify code around detailed analysis in scene.c

----------------------------------------
1 Path Changed]]>
Tue, 17 Sep 2013 08:29:48 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/5067501b4056568fba574a0bbe0eee965e8a1b87Sergey Sharybin
<![CDATA[[56f0062]: DerivedRender cleanup and improvements]]> http://www.miikahweb.com/en/blender/git-logs/commit/56f0062578e3c81181debc7ed318457310123d92 56f0062
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
DerivedRender cleanup and improvements

- Use special flags in DagNode for tags and scheduled
instead of trying to use color for this. This way
it's possible to have both tag and scheduler working
at the same time.

- Simplified DAG threaded traversal code, moved comments
to depsgaph instead of documenting what functions does
when using them.

- Switch from recursive tag flush to iterative one.

- Set scenes shall be handled properly in convertblender.

- Removed derivedRender construction from handle object
update function. It doesn't make much sense to have it
in both there and convertblender.

- Creating new task pool now ensures malloc is switched
to thread-safe one.

- Create derivedRender in threads using the same way as
it's done for object update. In really quick tests
gave around 2x speedup of database_init_objects when
having 130 suzannes with subsurf level of 3.

----------------------------------------
7 Paths Changed]]>
Mon, 02 Sep 2013 17:33:34 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/56f0062578e3c81181debc7ed318457310123d92Sergey Sharybin
<![CDATA[[57564da]: Merging r59367 through r59378 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/57564dac6109c2761b058b258479d5c97d848540 57564da
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59367 through r59378 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Thu, 22 Aug 2013 07:32:44 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/57564dac6109c2761b058b258479d5c97d848540Sergey Sharybin
<![CDATA[[5960352]: Merging r59766 through r59796 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/59603521202df1f2748144b0cc1c13cf74c2ea69 5960352
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59766 through r59796 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Wed, 04 Sep 2013 11:02:08 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/59603521202df1f2748144b0cc1c13cf74c2ea69Sergey Sharybin
<![CDATA[[5e0704c]: Merging r59317 through r59349 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/5e0704c2ec8ab5273dbf3fd868d0178ca8869fea 5e0704c
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59317 through r59349 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Wed, 21 Aug 2013 08:20:33 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/5e0704c2ec8ab5273dbf3fd868d0178ca8869feaSergey Sharybin
<![CDATA[[5e69e6d]: Merging r59258 through r59285 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/5e69e6dc2bb0851c2a70252587b435f08310274b 5e69e6d
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59258 through r59285 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Mon, 19 Aug 2013 11:26:21 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/5e69e6dc2bb0851c2a70252587b435f08310274bSergey Sharybin
<![CDATA[[6503259]: Merging r60468 through r60470 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/650325963dcad3d6437c47dc29753bbdfea01438 6503259
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r60468 through r60470 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Tue, 01 Oct 2013 08:27:02 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/650325963dcad3d6437c47dc29753bbdfea01438Sergey Sharybin
<![CDATA[[6a54ad2]: Merging r59294 through r59302 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/6a54ad246477fc306d689c7a165b047d7fa545e9 6a54ad2
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59294 through r59302 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Mon, 19 Aug 2013 14:27:48 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/6a54ad246477fc306d689c7a165b047d7fa545e9Sergey Sharybin
<![CDATA[[71c1447]: Merging r60198 through r60467 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/71c1447d6c20864be70fde8942f6e7dce59cd765 71c1447
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r60198 through r60467 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Tue, 01 Oct 2013 08:19:31 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/71c1447d6c20864be70fde8942f6e7dce59cd765Sergey Sharybin
<![CDATA[[73174d8]: Merging r59513 through r59528 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/73174d815393e8b5d929e460d24e422deabfc88c 73174d8
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59513 through r59528 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Mon, 26 Aug 2013 15:10:22 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/73174d815393e8b5d929e460d24e422deabfc88cSergey Sharybin
<![CDATA[[74e4e22]: Merging r59657 through r59734 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/74e4e2230b8f0c9d9f999c79ac01d843d8cd0e7e 74e4e22
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59657 through r59734 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Mon, 02 Sep 2013 14:01:52 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/74e4e2230b8f0c9d9f999c79ac01d843d8cd0e7eSergey Sharybin
<![CDATA[[74f29ac]: Remove piece of code which shouldn't have been sent to SVN]]> http://www.miikahweb.com/en/blender/git-logs/commit/74f29ac92842de629111c1bd2416c6d1ffdfa24f 74f29ac
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Remove piece of code which shouldn't have been sent to SVN

It was left from some experiments.

----------------------------------------
1 Path Changed]]>
Fri, 06 Sep 2013 09:31:14 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/74f29ac92842de629111c1bd2416c6d1ffdfa24fSergey Sharybin
<![CDATA[[76b5622]: Merge branch 'master' into soc-2013-depsgraph_mt]]> http://www.miikahweb.com/en/blender/git-logs/commit/76b562237f31a804cd2eba9e3af6effa54f31b5b 76b5622
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merge branch 'master' into soc-2013-depsgraph_mt

Conflicts:
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/collada/AnimationExporter.cpp
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_util.c
source/blender/render/intern/source/pipeline.c

----------------------------------------
0 Paths Changed]]>
Fri, 27 Dec 2013 11:05:49 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/76b562237f31a804cd2eba9e3af6effa54f31b5bSergey Sharybin
<![CDATA[[78bad7f]: Merging r59551 through r59632 from trunk into soc-2013-depsgraph_mt...]]> http://www.miikahweb.com/en/blender/git-logs/commit/78bad7fb14fb35e496546062a40a82495deaaaa6 78bad7f
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merging r59551 through r59632 from trunk into soc-2013-depsgraph_mt

----------------------------------------
0 Paths Changed]]>
Thu, 29 Aug 2013 13:14:24 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/78bad7fb14fb35e496546062a40a82495deaaaa6Sergey Sharybin
<![CDATA[[7a3ecab]: Merge branch 'master' into soc-2013-depsgraph_mt]]> http://www.miikahweb.com/en/blender/git-logs/commit/7a3ecab74b6d0c006ef2c5f30efc933233779ca7 7a3ecab
Branches : soc-2013-depsgraph_mt
Author : Sergey Sharybin (sergey)
----------------------------------------
Merge branch 'master' into soc-2013-depsgraph_mt

Conflicts:
release/datafiles/splash.png
release/scripts/startup/bl_ui/properties_render.py

----------------------------------------
0 Paths Changed]]>
Wed, 20 Nov 2013 17:41:41 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7a3ecab74b6d0c006ef2c5f30efc933233779ca7Sergey Sharybin