Blender Git Loki

Blender Git "asset-experiments" branch commits.

Page: 35 / 54

May 12, 2015, 17:39 (GMT)
Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/blenkernel/CMakeLists.txt
May 12, 2015, 17:21 (GMT)
Restore drag'n'drop from filebrowser.

We need to store non-static data here, so had to tweak drag and drop button code...
May 12, 2015, 15:00 (GMT)
Some cleanup and reducing diff from master.
May 12, 2015, 13:33 (GMT)
Merge branch 'master' into asset-experiments
May 11, 2015, 15:25 (GMT)
Merge branch 'asset-experiments' into asset-engine
May 11, 2015, 15:24 (GMT)
Merge branch 'master' into asset-experiments
May 11, 2015, 15:09 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/BKE_icons.h
source/blender/blenkernel/intern/icons.c
source/blender/editors/include/UI_interface_icons.h
source/blender/editors/interface/interface_icons.c
source/blender/makesrna/intern/rna_ID.c
May 11, 2015, 07:46 (GMT)
Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c
May 11, 2015, 07:36 (GMT)
Merge branch 'master' into asset-experiments
May 10, 2015, 15:15 (GMT)
Add variable sliding window for cached filebrowser items.

With big screens and tiny drawing, we can show much more than 1k items at once...
Also allows to reduce number of cached items in case we show few things big!
May 10, 2015, 13:26 (GMT)
Merge branch 'master' into asset-experiments
May 9, 2015, 14:43 (GMT)
Merge branch 'asset-experiments' into asset-engine
May 9, 2015, 14:42 (GMT)
Fix bad behavior in case of 'refresh' while still listing.

Mismatch in 'owner' of job, not giving right one to stoping helper, sigh.

Note that this was also affecting any 'interrupting' task (like changing level of flat listing...).
May 9, 2015, 14:06 (GMT)
Fix flickering of previews during listing process.

We cannot keep 'stable' list of items during listing process (each time new
entries are added, we have to filter and sort the whole lot again, which
means rebuilding 'draw' data from scratch - previews included).

Just wait until our filelist is complete to generate/use previews.
May 9, 2015, 14:00 (GMT)
Fix crash due to some missing final jop update in some rare cases.
May 9, 2015, 12:29 (GMT)
Merge branch 'master' into asset-experiments
May 7, 2015, 17:31 (GMT)
Merge branch 'asset-experiments' into asset-engine
May 7, 2015, 17:30 (GMT)
Fix win build...
May 7, 2015, 17:17 (GMT)
Merge branch 'master' into asset-experiments
May 6, 2015, 17:59 (GMT)
Get rid of nice 'static' in array args of functions, MSVC does not like them. :(
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021