May 6, 2015, 12:02 (GMT) |
Merge branch 'alembic' into gooseberry Conflicts: source/blender/blenkernel/BKE_key.h source/blender/blenkernel/intern/customdata.c source/blender/blenkernel/intern/key.c source/blender/editors/object/object_shapekey.c source/blender/makesdna/DNA_customdata_types.h source/blender/makesrna/intern/rna_key.c |
May 6, 2015, 11:58 (GMT) |
Only use render view name in render filenames if we are actually using multiview. |
May 6, 2015, 11:27 (GMT) |
Merge branch 'master' into cycles_kernel_split |
May 6, 2015, 11:05 (GMT) |
Image proxies now correctly support metadata (needs to regenerate proxies though) |
May 6, 2015, 11:05 (GMT) |
Cycles kernel split : Refactor: move atomic_add_float utility function to appropriate place in kernel_split.h |
May 6, 2015, 11:04 (GMT) |
Cycles kernel split : move atomic_add_float function to kernel_split.h |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macro to set args for megakernel |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macro to set args for shader/bake kernels |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macros to set args for film_convert kernel |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Undef KENREL_APPEND_ARG macro |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macros to add args to SumAllRadiance kernel |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macros to set args for Setupnextiter kernel |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macros to set args for shadow_blocked kernel |
May 6, 2015, 11:01 (GMT) |
Cyclse kernel split : Use macros to set args for DirectLighting kernel |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macros to set args for holdout_emission kernel |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macros to set args for Shader Lighting kernel |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macros to set args for bg_buffupdate kernel |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macros to set arg for QueueEnqueue kernel |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macros to set args for LampEmission kernel |
May 6, 2015, 11:01 (GMT) |
Cycles kernel split : Use macros to set args for sceneintersect kernel |
|
|
|


Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021