0
$\begingroup$

I build blender with "Add OptiX device implementation to Cycles" (https://developer.blender.org/D5363). I get it, everything is fine!

But! But I want build blender with outliner branch

I'm doing build now:

 H:

 cd H:\blender-git-28\blender

 git apply D5363.diff

 make update

 make full

Further build in MVS19

A Question:

How me add "outliner branch"?

How me update my build?

Now I build update:

 H:

 cd H:\blender-git-28\blender

 git submodule update --init --recursive
 git submodule foreach --recursive git checkout master
 git submodule foreach --recursive git pull --rebase origin master

 make update

 make full

But its don't working on me (version blender on start screen Blender don't update)

$\endgroup$
3
  • 3
    $\begingroup$ I'm voting to close this question as off-topic because it is about building blender. See: blender.meta.stackexchange.com/questions/399/… $\endgroup$ Aug 17, 2019 at 13:17
  • $\begingroup$ Hi. As questions about building blender are off-topic, devtalk.blender.org, blenderartists or the bf-commiters mailing list will be a better place for this. $\endgroup$ Aug 17, 2019 at 13:21
  • $\begingroup$ Sorry. I thought I could ask any questions here. $\endgroup$ Aug 17, 2019 at 15:37

1 Answer 1

2
$\begingroup$

In order to build the outliner branch you switch to that branch first.

git checkout soc-2019-outliner

Make sure that the branch is up-to-date:

git pull

Then you're ready to build.

make full

When you want to switch back to the master branch the command is:

git checkout master

Unfortunately you can't directly apply the OptiX patch to the outliner branch because of incompatible code changes that cause merge conflict.

$\endgroup$
1

Not the answer you're looking for? Browse other questions tagged .